Cookiebot | GDPR Compliant Cookie Consent and Notice - Version 3.2.0

Version Description

Download this release

Release Info

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

Code changes from version 3.1.0 to 3.2.0

Files changed (6) hide show
  1. addons/controller/plugin-controller.php +1 -1
  2. addons/cookiebot-addons-init.php +1 -1
  3. addons/lib/helper.php +5 -5
  4. addons/tests/integration/addons/test-instagram-feed.php +3 -3
  5. cookiebot.php +60 -4
  6. readme.txt +6 -1
addons/controller/plugin-controller.php CHANGED
@@ -63,7 +63,7 @@ class Plugin_Controller {
63
  if( \Cookiebot_WP::cookiebot_disabled_in_admin() === true && is_admin() ) {
64
  return;
65
  }
66
-
67
  /**
68
  * Check plugins one by one and load configuration if it is active
69
  *
63
  if( \Cookiebot_WP::cookiebot_disabled_in_admin() === true && is_admin() ) {
64
  return;
65
  }
66
+
67
  /**
68
  * Check plugins one by one and load configuration if it is active
69
  *
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.1.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.2.0' );
27
 
28
  /**
29
  * Register autoloader to load files/classes dynamically
addons/lib/helper.php CHANGED
@@ -7,19 +7,19 @@
7
  */
8
 
9
  function cookiebot_addons_enabled_cache_plugin() {
10
- if(defined("WP_ROCKET_PATH")) {
11
  return true; //WP Rocket - We need to ensure we not cache tags without attributes
12
  }
13
- if(defined("W3TC")) {
14
  return true; //W3 Total Cache
15
  }
16
- if(defined("WPCACHEHOME")) {
17
  return true; //WP Super Cache
18
  }
19
- if(defined("WPFC_WP_PLUGIN_DIR")) {
20
  return true; //WP Fastest Cache
21
  }
22
- if(defined("LSCWP_CONTENT_DIR")) {
23
  return true; //Litespeed Cache
24
  }
25
  return false;
7
  */
8
 
9
  function cookiebot_addons_enabled_cache_plugin() {
10
+ if( defined( "WP_ROCKET_PATH" ) ) {
11
  return true; //WP Rocket - We need to ensure we not cache tags without attributes
12
  }
13
+ if( defined( "W3TC" ) ) {
14
  return true; //W3 Total Cache
15
  }
16
+ if( defined( "WPCACHEHOME" ) ) {
17
  return true; //WP Super Cache
18
  }
19
+ if( defined( "WPFC_WP_PLUGIN_DIR" ) ) {
20
  return true; //WP Fastest Cache
21
  }
22
+ if( defined( "LSCWP_CONTENT_DIR" ) ) {
23
  return true; //Litespeed Cache
24
  }
25
  return false;
addons/tests/integration/addons/test-instagram-feed.php CHANGED
@@ -14,8 +14,8 @@ class Test_Instagram_Feed extends \WP_UnitTestCase {
14
  * @since 2.1.0
15
  */
16
  public function test_instagram_feed() {
17
- $content = file_get_contents( 'http://plugins.svn.wordpress.org/instagram-feed/trunk/instagram-feed.php' );
18
 
19
- $this->assertNotFalse( strpos( $content, 'add_action( \'wp_enqueue_scripts\', \'sb_instagram_scripts_enqueue\' );') );
20
  }
21
- }
14
  * @since 2.1.0
15
  */
16
  public function test_instagram_feed() {
17
+ $content = file_get_contents( 'http://plugins.svn.wordpress.org/instagram-feed/trunk/inc/if-functions.php' );
18
 
19
+ $this->assertNotFalse( strpos( $content, 'add_action( \'wp_enqueue_scripts\', \'sb_instagram_scripts_enqueue\', 2 );') );
20
  }
21
+ }
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.1.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.0.1';
25
 
26
  /**
27
  * @var Cookiebot_WP The single instance of the class
@@ -57,6 +57,9 @@ final class Cookiebot_WP {
57
  add_action('plugins_loaded', array($this, 'cookiebot_init'), 5);
58
  register_activation_hook( __FILE__ , array($this, 'activation'));
59
  register_deactivation_hook( __FILE__, 'cookiebot_addons_plugin_deactivated' );
 
 
 
60
  }
61
 
62
  /**
@@ -87,7 +90,7 @@ final class Cookiebot_WP {
87
  /**
88
  * Cookiebot_WP Init Cookiebot.
89
  *
90
- * @version 2.2.0
91
  * @since 1.6.2
92
  * @access public
93
  */
@@ -1010,7 +1013,7 @@ final class Cookiebot_WP {
1010
  */
1011
  function add_js() {
1012
  $cbid = $this->get_cbid();
1013
- if(!empty($cbid)) {
1014
  if(is_multisite() && get_site_option('cookiebot-nooutput',false)) {
1015
  return; //Is multisite - and disabled output is checked as network setting
1016
  }
@@ -1247,6 +1250,59 @@ final class Cookiebot_WP {
1247
  }
1248
  }
1249
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1250
 
1251
  }
1252
  endif;
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
  * @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
57
  add_action('plugins_loaded', array($this, 'cookiebot_init'), 5);
58
  register_activation_hook( __FILE__ , array($this, 'activation'));
59
  register_deactivation_hook( __FILE__, 'cookiebot_addons_plugin_deactivated' );
60
+
61
+ $this->cookiebot_fix_plugin_conflicts();
62
+
63
  }
64
 
65
  /**
90
  /**
91
  * Cookiebot_WP Init Cookiebot.
92
  *
93
+ * @version 3.2.0
94
  * @since 1.6.2
95
  * @access public
96
  */
1013
  */
1014
  function add_js() {
1015
  $cbid = $this->get_cbid();
1016
+ if(!empty($cbid) && !defined('COOKIEBOT_DISABLE_ON_PAGE')) {
1017
  if(is_multisite() && get_site_option('cookiebot-nooutput',false)) {
1018
  return; //Is multisite - and disabled output is checked as network setting
1019
  }
1250
  }
1251
  }
1252
  }
1253
+
1254
+
1255
+
1256
+
1257
+ /**
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
+ /**
1273
+ * Cookiebot_WP Fix Divi builder conflict when blocking mode is in auto.
1274
+ *
1275
+ * @version 3.2.0
1276
+ * @since 3.2.0
1277
+ */
1278
+ function _cookiebot_plugin_conflict_divi() {
1279
+ if ( defined( 'ET_FB_ENABLED' ) ) {
1280
+ if ( ET_FB_ENABLED &&
1281
+ $this->cookiebot_disabled_in_admin() &&
1282
+ $this->get_cookie_blocking_mode() == 'auto' ) {
1283
+
1284
+ define('COOKIEBOT_DISABLE_ON_PAGE',true); //Disable Cookiebot on the current page
1285
+
1286
+ }
1287
+ }
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
 
1307
  }
1308
  endif;
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.1.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.1.0 - 2019-09-24 ###
168
  * Change option to hide cookie banner in WP Admin to instead disabling Cookiebot
169
  * Set option to disable Cookiebot banner as default for new installs
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
 
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).
170
+ * Minor adjustments to code style and unit tests
171
+
172
  ### 3.1.0 - 2019-09-24 ###
173
  * Change option to hide cookie banner in WP Admin to instead disabling Cookiebot
174
  * Set option to disable Cookiebot banner as default for new installs