Cookiebot | GDPR Compliant Cookie Consent and Notice - Version 3.3.0

Version Description

Download this release

Release Info

Developer cookiebot
Plugin Icon 128x128 Cookiebot | GDPR Compliant Cookie Consent and Notice
Version 3.3.0
Comparing to
See all releases

Code changes from version 3.2.0 to 3.3.0

Files changed (11) hide show
  1. addons/composer.json +3 -0
  2. addons/composer.lock +6 -6
  3. addons/cookiebot-addons-init.php +1 -1
  4. addons/lib/ioc/autoload.php +1 -1
  5. addons/lib/ioc/composer/ClassLoader.php +4 -4
  6. addons/lib/ioc/composer/autoload_real.php +8 -8
  7. addons/lib/ioc/composer/autoload_static.php +3 -3
  8. addons/lib/ioc/composer/installed.json +90 -90
  9. addons/lib/ioc/php-di/phpdoc-reader/src/PhpDocReader/PhpDocReader.php +1 -0
  10. cookiebot.php +43 -13
  11. readme.txt +6 -1
addons/composer.json CHANGED
@@ -1,5 +1,8 @@
1
  {
2
  "require": {
3
  "php-di/php-di": "5.0"
 
 
 
4
  }
5
  }
1
  {
2
  "require": {
3
  "php-di/php-di": "5.0"
4
+ },
5
+ "config":{
6
+ "prepend-autoloader": false
7
  }
8
  }
addons/composer.lock CHANGED
@@ -1,7 +1,7 @@
1
  {
2
  "_readme": [
3
  "This file locks the dependencies of your project to a known state",
4
- "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
5
  "This file is @generated automatically"
6
  ],
7
  "content-hash": "201899dc63377043c49159a10773dd47",
@@ -136,16 +136,16 @@
136
  },
137
  {
138
  "name": "php-di/phpdoc-reader",
139
- "version": "2.1.0",
140
  "source": {
141
  "type": "git",
142
  "url": "https://github.com/PHP-DI/PhpDocReader.git",
143
- "reference": "7d0de60b9341933c8afd172a6255cd7557601e0e"
144
  },
145
  "dist": {
146
  "type": "zip",
147
- "url": "https://api.github.com/repos/PHP-DI/PhpDocReader/zipball/7d0de60b9341933c8afd172a6255cd7557601e0e",
148
- "reference": "7d0de60b9341933c8afd172a6255cd7557601e0e",
149
  "shasum": ""
150
  },
151
  "require": {
@@ -169,7 +169,7 @@
169
  "phpdoc",
170
  "reflection"
171
  ],
172
- "time": "2018-02-18T17:39:01+00:00"
173
  },
174
  {
175
  "name": "psr/container",
1
  {
2
  "_readme": [
3
  "This file locks the dependencies of your project to a known state",
4
+ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
5
  "This file is @generated automatically"
6
  ],
7
  "content-hash": "201899dc63377043c49159a10773dd47",
136
  },
137
  {
138
  "name": "php-di/phpdoc-reader",
139
+ "version": "2.1.1",
140
  "source": {
141
  "type": "git",
142
  "url": "https://github.com/PHP-DI/PhpDocReader.git",
143
+ "reference": "15678f7451c020226807f520efb867ad26fbbfcf"
144
  },
145
  "dist": {
146
  "type": "zip",
147
+ "url": "https://api.github.com/repos/PHP-DI/PhpDocReader/zipball/15678f7451c020226807f520efb867ad26fbbfcf",
148
+ "reference": "15678f7451c020226807f520efb867ad26fbbfcf",
149
  "shasum": ""
150
  },
151
  "require": {
169
  "phpdoc",
170
  "reflection"
171
  ],
172
+ "time": "2019-09-26T11:24:58+00:00"
173
  },
174
  {
175
  "name": "psr/container",
addons/cookiebot-addons-init.php CHANGED
@@ -23,7 +23,7 @@ define( 'COOKIEBOT_ADDONS_BASE_NAME', dirname( plugin_basename( __FILE__ ) ) );
23
  /**
24
  * Same version as the CookiebotWP
25
  */
26
- define( 'COOKIEBOT_ADDONS_VERSION', '3.2.0' );
27
 
28
  /**
29
  * Register autoloader to load files/classes dynamically
23
  /**
24
  * Same version as the CookiebotWP
25
  */
26
+ define( 'COOKIEBOT_ADDONS_VERSION', '3.3.0' );
27
 
28
  /**
29
  * Register autoloader to load files/classes dynamically
addons/lib/ioc/autoload.php CHANGED
@@ -4,4 +4,4 @@
4
 
5
  require_once __DIR__ . '/composer/autoload_real.php';
6
 
7
- return ComposerAutoloaderInit3b7bc7f1dc820c2b29f44b9db898a0f8::getLoader();
4
 
5
  require_once __DIR__ . '/composer/autoload_real.php';
6
 
7
+ return ComposerAutoloaderInit8a2128fc5718e70d5efac860b1783350::getLoader();
addons/lib/ioc/composer/ClassLoader.php CHANGED
@@ -279,7 +279,7 @@ class ClassLoader
279
  */
280
  public function setApcuPrefix($apcuPrefix)
281
  {
282
- $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
283
  }
284
 
285
  /**
@@ -377,11 +377,11 @@ class ClassLoader
377
  $subPath = $class;
378
  while (false !== $lastPos = strrpos($subPath, '\\')) {
379
  $subPath = substr($subPath, 0, $lastPos);
380
- $search = $subPath.'\\';
381
  if (isset($this->prefixDirsPsr4[$search])) {
 
382
  foreach ($this->prefixDirsPsr4[$search] as $dir) {
383
- $length = $this->prefixLengthsPsr4[$first][$search];
384
- if (file_exists($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
385
  return $file;
386
  }
387
  }
279
  */
280
  public function setApcuPrefix($apcuPrefix)
281
  {
282
+ $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
283
  }
284
 
285
  /**
377
  $subPath = $class;
378
  while (false !== $lastPos = strrpos($subPath, '\\')) {
379
  $subPath = substr($subPath, 0, $lastPos);
380
+ $search = $subPath . '\\';
381
  if (isset($this->prefixDirsPsr4[$search])) {
382
+ $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
383
  foreach ($this->prefixDirsPsr4[$search] as $dir) {
384
+ if (file_exists($file = $dir . $pathEnd)) {
 
385
  return $file;
386
  }
387
  }
addons/lib/ioc/composer/autoload_real.php CHANGED
@@ -2,7 +2,7 @@
2
 
3
  // autoload_real.php @generated by Composer
4
 
5
- class ComposerAutoloaderInit3b7bc7f1dc820c2b29f44b9db898a0f8
6
  {
7
  private static $loader;
8
 
@@ -19,15 +19,15 @@ class ComposerAutoloaderInit3b7bc7f1dc820c2b29f44b9db898a0f8
19
  return self::$loader;
20
  }
21
 
22
- spl_autoload_register(array('ComposerAutoloaderInit3b7bc7f1dc820c2b29f44b9db898a0f8', 'loadClassLoader'), true, true);
23
  self::$loader = $loader = new \Composer\Autoload\ClassLoader();
24
- spl_autoload_unregister(array('ComposerAutoloaderInit3b7bc7f1dc820c2b29f44b9db898a0f8', 'loadClassLoader'));
25
 
26
  $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
27
  if ($useStaticLoader) {
28
  require_once __DIR__ . '/autoload_static.php';
29
 
30
- call_user_func(\Composer\Autoload\ComposerStaticInit3b7bc7f1dc820c2b29f44b9db898a0f8::getInitializer($loader));
31
  } else {
32
  $map = require __DIR__ . '/autoload_namespaces.php';
33
  foreach ($map as $namespace => $path) {
@@ -45,22 +45,22 @@ class ComposerAutoloaderInit3b7bc7f1dc820c2b29f44b9db898a0f8
45
  }
46
  }
47
 
48
- $loader->register(true);
49
 
50
  if ($useStaticLoader) {
51
- $includeFiles = Composer\Autoload\ComposerStaticInit3b7bc7f1dc820c2b29f44b9db898a0f8::$files;
52
  } else {
53
  $includeFiles = require __DIR__ . '/autoload_files.php';
54
  }
55
  foreach ($includeFiles as $fileIdentifier => $file) {
56
- composerRequire3b7bc7f1dc820c2b29f44b9db898a0f8($fileIdentifier, $file);
57
  }
58
 
59
  return $loader;
60
  }
61
  }
62
 
63
- function composerRequire3b7bc7f1dc820c2b29f44b9db898a0f8($fileIdentifier, $file)
64
  {
65
  if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
66
  require $file;
2
 
3
  // autoload_real.php @generated by Composer
4
 
5
+ class ComposerAutoloaderInit8a2128fc5718e70d5efac860b1783350
6
  {
7
  private static $loader;
8
 
19
  return self::$loader;
20
  }
21
 
22
+ spl_autoload_register(array('ComposerAutoloaderInit8a2128fc5718e70d5efac860b1783350', 'loadClassLoader'), true, false);
23
  self::$loader = $loader = new \Composer\Autoload\ClassLoader();
24
+ spl_autoload_unregister(array('ComposerAutoloaderInit8a2128fc5718e70d5efac860b1783350', 'loadClassLoader'));
25
 
26
  $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
27
  if ($useStaticLoader) {
28
  require_once __DIR__ . '/autoload_static.php';
29
 
30
+ call_user_func(\Composer\Autoload\ComposerStaticInit8a2128fc5718e70d5efac860b1783350::getInitializer($loader));
31
  } else {
32
  $map = require __DIR__ . '/autoload_namespaces.php';
33
  foreach ($map as $namespace => $path) {
45
  }
46
  }
47
 
48
+ $loader->register(false);
49
 
50
  if ($useStaticLoader) {
51
+ $includeFiles = Composer\Autoload\ComposerStaticInit8a2128fc5718e70d5efac860b1783350::$files;
52
  } else {
53
  $includeFiles = require __DIR__ . '/autoload_files.php';
54
  }
55
  foreach ($includeFiles as $fileIdentifier => $file) {
56
+ composerRequire8a2128fc5718e70d5efac860b1783350($fileIdentifier, $file);
57
  }
58
 
59
  return $loader;
60
  }
61
  }
62
 
63
+ function composerRequire8a2128fc5718e70d5efac860b1783350($fileIdentifier, $file)
64
  {
65
  if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
66
  require $file;
addons/lib/ioc/composer/autoload_static.php CHANGED
@@ -4,7 +4,7 @@
4
 
5
  namespace Composer\Autoload;
6
 
7
- class ComposerStaticInit3b7bc7f1dc820c2b29f44b9db898a0f8
8
  {
9
  public static $files = array (
10
  'bbf73f3db644d3dced353b837903e74c' => __DIR__ . '/..' . '/php-di/php-di/src/DI/functions.php',
@@ -53,8 +53,8 @@ class ComposerStaticInit3b7bc7f1dc820c2b29f44b9db898a0f8
53
  public static function getInitializer(ClassLoader $loader)
54
  {
55
  return \Closure::bind(function () use ($loader) {
56
- $loader->prefixLengthsPsr4 = ComposerStaticInit3b7bc7f1dc820c2b29f44b9db898a0f8::$prefixLengthsPsr4;
57
- $loader->prefixDirsPsr4 = ComposerStaticInit3b7bc7f1dc820c2b29f44b9db898a0f8::$prefixDirsPsr4;
58
 
59
  }, null, ClassLoader::class);
60
  }
4
 
5
  namespace Composer\Autoload;
6
 
7
+ class ComposerStaticInit8a2128fc5718e70d5efac860b1783350
8
  {
9
  public static $files = array (
10
  'bbf73f3db644d3dced353b837903e74c' => __DIR__ . '/..' . '/php-di/php-di/src/DI/functions.php',
53
  public static function getInitializer(ClassLoader $loader)
54
  {
55
  return \Closure::bind(function () use ($loader) {
56
+ $loader->prefixLengthsPsr4 = ComposerStaticInit8a2128fc5718e70d5efac860b1783350::$prefixLengthsPsr4;
57
+ $loader->prefixDirsPsr4 = ComposerStaticInit8a2128fc5718e70d5efac860b1783350::$prefixDirsPsr4;
58
 
59
  }, null, ClassLoader::class);
60
  }
addons/lib/ioc/composer/installed.json CHANGED
@@ -1,94 +1,4 @@
1
  [
2
- {
3
- "name": "php-di/phpdoc-reader",
4
- "version": "2.1.0",
5
- "version_normalized": "2.1.0.0",
6
- "source": {
7
- "type": "git",
8
- "url": "https://github.com/PHP-DI/PhpDocReader.git",
9
- "reference": "7d0de60b9341933c8afd172a6255cd7557601e0e"
10
- },
11
- "dist": {
12
- "type": "zip",
13
- "url": "https://api.github.com/repos/PHP-DI/PhpDocReader/zipball/7d0de60b9341933c8afd172a6255cd7557601e0e",
14
- "reference": "7d0de60b9341933c8afd172a6255cd7557601e0e",
15
- "shasum": ""
16
- },
17
- "require": {
18
- "php": ">=5.4.0"
19
- },
20
- "require-dev": {
21
- "phpunit/phpunit": "~4.6"
22
- },
23
- "time": "2018-02-18T17:39:01+00:00",
24
- "type": "library",
25
- "installation-source": "dist",
26
- "autoload": {
27
- "psr-4": {
28
- "PhpDocReader\\": "src/PhpDocReader"
29
- }
30
- },
31
- "notification-url": "https://packagist.org/downloads/",
32
- "license": [
33
- "MIT"
34
- ],
35
- "description": "PhpDocReader parses @var and @param values in PHP docblocks (supports namespaced class names with the same resolution rules as PHP)",
36
- "keywords": [
37
- "phpdoc",
38
- "reflection"
39
- ]
40
- },
41
- {
42
- "name": "psr/container",
43
- "version": "1.0.0",
44
- "version_normalized": "1.0.0.0",
45
- "source": {
46
- "type": "git",
47
- "url": "https://github.com/php-fig/container.git",
48
- "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
49
- },
50
- "dist": {
51
- "type": "zip",
52
- "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
53
- "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
54
- "shasum": ""
55
- },
56
- "require": {
57
- "php": ">=5.3.0"
58
- },
59
- "time": "2017-02-14T16:28:37+00:00",
60
- "type": "library",
61
- "extra": {
62
- "branch-alias": {
63
- "dev-master": "1.0.x-dev"
64
- }
65
- },
66
- "installation-source": "dist",
67
- "autoload": {
68
- "psr-4": {
69
- "Psr\\Container\\": "src/"
70
- }
71
- },
72
- "notification-url": "https://packagist.org/downloads/",
73
- "license": [
74
- "MIT"
75
- ],
76
- "authors": [
77
- {
78
- "name": "PHP-FIG",
79
- "homepage": "http://www.php-fig.org/"
80
- }
81
- ],
82
- "description": "Common Container Interface (PHP FIG PSR-11)",
83
- "homepage": "https://github.com/php-fig/container",
84
- "keywords": [
85
- "PSR-11",
86
- "container",
87
- "container-interface",
88
- "container-interop",
89
- "psr"
90
- ]
91
- },
92
  {
93
  "name": "container-interop/container-interop",
94
  "version": "1.2.0",
@@ -222,5 +132,95 @@
222
  "dependency injection",
223
  "di"
224
  ]
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
225
  }
226
  ]
1
  [
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2
  {
3
  "name": "container-interop/container-interop",
4
  "version": "1.2.0",
132
  "dependency injection",
133
  "di"
134
  ]
135
+ },
136
+ {
137
+ "name": "php-di/phpdoc-reader",
138
+ "version": "2.1.1",
139
+ "version_normalized": "2.1.1.0",
140
+ "source": {
141
+ "type": "git",
142
+ "url": "https://github.com/PHP-DI/PhpDocReader.git",
143
+ "reference": "15678f7451c020226807f520efb867ad26fbbfcf"
144
+ },
145
+ "dist": {
146
+ "type": "zip",
147
+ "url": "https://api.github.com/repos/PHP-DI/PhpDocReader/zipball/15678f7451c020226807f520efb867ad26fbbfcf",
148
+ "reference": "15678f7451c020226807f520efb867ad26fbbfcf",
149
+ "shasum": ""
150
+ },
151
+ "require": {
152
+ "php": ">=5.4.0"
153
+ },
154
+ "require-dev": {
155
+ "phpunit/phpunit": "~4.6"
156
+ },
157
+ "time": "2019-09-26T11:24:58+00:00",
158
+ "type": "library",
159
+ "installation-source": "dist",
160
+ "autoload": {
161
+ "psr-4": {
162
+ "PhpDocReader\\": "src/PhpDocReader"
163
+ }
164
+ },
165
+ "notification-url": "https://packagist.org/downloads/",
166
+ "license": [
167
+ "MIT"
168
+ ],
169
+ "description": "PhpDocReader parses @var and @param values in PHP docblocks (supports namespaced class names with the same resolution rules as PHP)",
170
+ "keywords": [
171
+ "phpdoc",
172
+ "reflection"
173
+ ]
174
+ },
175
+ {
176
+ "name": "psr/container",
177
+ "version": "1.0.0",
178
+ "version_normalized": "1.0.0.0",
179
+ "source": {
180
+ "type": "git",
181
+ "url": "https://github.com/php-fig/container.git",
182
+ "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
183
+ },
184
+ "dist": {
185
+ "type": "zip",
186
+ "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
187
+ "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
188
+ "shasum": ""
189
+ },
190
+ "require": {
191
+ "php": ">=5.3.0"
192
+ },
193
+ "time": "2017-02-14T16:28:37+00:00",
194
+ "type": "library",
195
+ "extra": {
196
+ "branch-alias": {
197
+ "dev-master": "1.0.x-dev"
198
+ }
199
+ },
200
+ "installation-source": "dist",
201
+ "autoload": {
202
+ "psr-4": {
203
+ "Psr\\Container\\": "src/"
204
+ }
205
+ },
206
+ "notification-url": "https://packagist.org/downloads/",
207
+ "license": [
208
+ "MIT"
209
+ ],
210
+ "authors": [
211
+ {
212
+ "name": "PHP-FIG",
213
+ "homepage": "http://www.php-fig.org/"
214
+ }
215
+ ],
216
+ "description": "Common Container Interface (PHP FIG PSR-11)",
217
+ "homepage": "https://github.com/php-fig/container",
218
+ "keywords": [
219
+ "PSR-11",
220
+ "container",
221
+ "container-interface",
222
+ "container-interop",
223
+ "psr"
224
+ ]
225
  }
226
  ]
addons/lib/ioc/php-di/phpdoc-reader/src/PhpDocReader/PhpDocReader.php CHANGED
@@ -34,6 +34,7 @@ class PhpDocReader
34
  'callable',
35
  'resource',
36
  'mixed',
 
37
  );
38
 
39
  /**
34
  'callable',
35
  'resource',
36
  'mixed',
37
+ 'iterable',
38
  );
39
 
40
  /**
cookiebot.php CHANGED
@@ -4,7 +4,7 @@ Plugin Name: Cookiebot | GDPR Compliant Cookie Consent and Notice
4
  Plugin URI: https://cookiebot.com/
5
  Description: Cookiebot is a fully GDPR & ePrivacy compliant cookie consent solution supporting prior consent, cookie declaration, and documentation of consents. Easy to install, implement and configure.
6
  Author: Cybot A/S
7
- Version: 3.2.0
8
  Author URI: http://cookiebot.com
9
  Text Domain: cookiebot
10
  Domain Path: /langs
@@ -21,7 +21,7 @@ final class Cookiebot_WP {
21
  * @var string
22
  * @since 1.0.0
23
  */
24
- public $version = '3.2.0';
25
 
26
  /**
27
  * @var Cookiebot_WP The single instance of the class
@@ -1258,15 +1258,15 @@ final class Cookiebot_WP {
1258
  * Cookiebot_WP Fix plugin conflicts related to Cookiebot
1259
  *
1260
  * @version 3.2.0
1261
- * @since 3.2.0
1262
  */
1263
  function cookiebot_fix_plugin_conflicts() {
1264
  //Fix for Divi Page Builder
1265
  add_action( 'wp', array( $this, '_cookiebot_plugin_conflict_divi' ), 100 );
1266
 
1267
- //Fix for Elementor Builder
1268
- add_filter( 'script_loader_tag', array( $this, '_cookiebot_plugin_conflict_elementor' ), 10, 2 );
1269
-
1270
  }
1271
 
1272
  /**
@@ -1288,19 +1288,49 @@ final class Cookiebot_WP {
1288
  }
1289
 
1290
  /**
1291
- * Cookiebot_WP Fix Elementor builder conflict - whitelist JS files in automode
1292
  *
1293
  * @version 3.2.0
1294
- * @since 3.2.0
1295
  */
1296
- function _cookiebot_plugin_conflict_elementor( $tag, $handle ) {
1297
- if( !defined( 'ELEMENTOR_VERSION' ) ) {
1298
- return $tag;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1299
  }
1300
 
1301
- if( in_array( $handle, [ 'jquery-core', 'elementor-frontend-modules', 'elementor-frontend', 'wp-tinymce' ] ) ) {
1302
- $tag = str_replace( '<script ', '<script data-cookieconsent="ignore" ', $tag );
 
 
 
 
 
 
 
 
 
 
 
 
 
1303
  }
 
1304
  return $tag;
1305
  }
1306
 
4
  Plugin URI: https://cookiebot.com/
5
  Description: Cookiebot is a fully GDPR & ePrivacy compliant cookie consent solution supporting prior consent, cookie declaration, and documentation of consents. Easy to install, implement and configure.
6
  Author: Cybot A/S
7
+ Version: 3.3.0
8
  Author URI: http://cookiebot.com
9
  Text Domain: cookiebot
10
  Domain Path: /langs
21
  * @var string
22
  * @since 1.0.0
23
  */
24
+ public $version = '3.3.0';
25
 
26
  /**
27
  * @var Cookiebot_WP The single instance of the class
1258
  * Cookiebot_WP Fix plugin conflicts related to Cookiebot
1259
  *
1260
  * @version 3.2.0
1261
+ * @since 3.3.0
1262
  */
1263
  function cookiebot_fix_plugin_conflicts() {
1264
  //Fix for Divi Page Builder
1265
  add_action( 'wp', array( $this, '_cookiebot_plugin_conflict_divi' ), 100 );
1266
 
1267
+ //Fix for Elementor and WPBakery Page Builder Builder
1268
+ add_filter( 'script_loader_tag', array( $this, '_cookiebot_plugin_conflict_scripttags' ), 10, 2 );
1269
+
1270
  }
1271
 
1272
  /**
1288
  }
1289
 
1290
  /**
1291
+ * Cookiebot_WP Fix plugin conflicts with page builders - whitelist JS files in automode
1292
  *
1293
  * @version 3.2.0
1294
+ * @since 3.3.0
1295
  */
1296
+ function _cookiebot_plugin_conflict_scripttags( $tag, $handle ) {
1297
+
1298
+ //Check if Elementor Page Builder active
1299
+ if( defined( 'ELEMENTOR_VERSION' ) ) {
1300
+ if( in_array( $handle, [
1301
+ 'jquery-core',
1302
+ 'elementor-frontend-modules',
1303
+ 'elementor-frontend',
1304
+ 'wp-tinymce' ,
1305
+ 'underscore',
1306
+ 'backbone',
1307
+ 'backbone-marionette',
1308
+ 'backbone-radio',
1309
+ 'elementor-common-modules',
1310
+ 'elementor-dialog',
1311
+ 'elementor-common',
1312
+ ] ) ) {
1313
+ $tag = str_replace( '<script ', '<script data-cookieconsent="ignore" ', $tag );
1314
+ }
1315
  }
1316
 
1317
+ //Check if WPBakery Page Builder active
1318
+ if ( defined( 'WPB_VC_VERSION' ) ) {
1319
+ if( in_array( $handle, [
1320
+ 'jquery-core',
1321
+ 'jquery-ui-core',
1322
+ 'jquery-ui-sortable',
1323
+ 'jquery-ui-mouse',
1324
+ 'jquery-ui-widget',
1325
+ 'vc_editors-templates-preview-js',
1326
+ 'vc-frontend-editor-min-js',
1327
+ 'vc_inline_iframe_js',
1328
+ 'wpb_composer_front_js',
1329
+ ] ) ) {
1330
+ $tag = str_replace( '<script ', '<script data-cookieconsent="ignore" ', $tag );
1331
+ }
1332
  }
1333
+
1334
  return $tag;
1335
  }
1336
 
readme.txt CHANGED
@@ -3,7 +3,7 @@
3
  * Tags: cookie, compliance, eu, gdpr, europe, cookie consent, consent
4
  * Requires at least: 4.4
5
  * Tested up to: 5.2
6
- * Stable tag: 3.2.0
7
  * Requires PHP: 5.6
8
  * License: GPLv2 or later
9
 
@@ -164,6 +164,11 @@ Cookiebot works with GTM, however you need to enable the "Hide Cookie Popup" opt
164
 
165
  ## Changelog ##
166
 
 
 
 
 
 
167
  ### 3.2.0 - 2019-10-29 ###
168
  * Adding fix for conflict with Elementor Page Builder when Cookie blocking is in auto mode
169
  * Adding fix for conflict with Divi Builder when Cookie blocking is in auto mode (still need to disable Cookiebot on admin pages to work properly).
3
  * Tags: cookie, compliance, eu, gdpr, europe, cookie consent, consent
4
  * Requires at least: 4.4
5
  * Tested up to: 5.2
6
+ * Stable tag: 3.3.0
7
  * Requires PHP: 5.6
8
  * License: GPLv2 or later
9
 
164
 
165
  ## Changelog ##
166
 
167
+ ### 3.3.0 - 2019-11-09 ###
168
+ * Fix for conflict with WPBakery Page Builder when Cookie blocking is in auto mode
169
+ * Fix for Elementor Extras causing JS errors in frontend when Cookie blocking is in auto mode
170
+ * Removing prepending of composer autoloader - causing conflicts with other plugins.
171
+
172
  ### 3.2.0 - 2019-10-29 ###
173
  * Adding fix for conflict with Elementor Page Builder when Cookie blocking is in auto mode
174
  * Adding fix for conflict with Divi Builder when Cookie blocking is in auto mode (still need to disable Cookiebot on admin pages to work properly).