Cookiebot | GDPR Compliant Cookie Consent and Notice - Version 3.4.1

Version Description

Download this release

Release Info

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

Code changes from version 3.4.0 to 3.4.1

Files changed (6) hide show
  1. addons/controller/addons/caos-host-analyticsjs-local/caos-host-analyticsjs-local.php +4 -2
  2. addons/cookiebot-addons-init.php +1 -1
  3. addons/tests/integration/addons/test-caos-host-analyticsjs-local.php +4 -3
  4. addons/tests/integration/addons/test-hubspot-leadin.php +1 -1
  5. cookiebot.php +6 -4
  6. readme.txt +5 -1
addons/controller/addons/caos-host-analyticsjs-local/caos-host-analyticsjs-local.php CHANGED
@@ -84,7 +84,8 @@ class CAOS_Host_Analyticsjs_Local implements Cookiebot_Addons_Interface {
84
  */
85
  if ( has_action( 'wp_footer', 'caos_analytics_render_tracking_code' ) ||
86
  has_action( 'wp_footer', 'caos_render_tracking_code' ) ||
87
- has_action( 'wp_footer', 'add_ga_header_script' ) ) {
 
88
  /**
89
  * Consent not given - no cache
90
  */
@@ -98,7 +99,8 @@ class CAOS_Host_Analyticsjs_Local implements Cookiebot_Addons_Interface {
98
  */
99
  if ( has_action( 'wp_head', 'caos_analytics_render_tracking_code' ) ||
100
  has_action( 'wp_head', 'caos_render_tracking_code' ) ||
101
- has_action( 'wp_head', 'add_ga_header_script' ) ) {
 
102
  /**
103
  * Consent not given - no cache
104
  */
84
  */
85
  if ( has_action( 'wp_footer', 'caos_analytics_render_tracking_code' ) ||
86
  has_action( 'wp_footer', 'caos_render_tracking_code' ) ||
87
+ has_action( 'wp_footer', 'add_ga_header_script' ) ||
88
+ ( defined( 'CAOS_OPT_SCRIPT_POSITION' ) && CAOS_OPT_SCRIPT_POSITION == 'footer' ) ) {
89
  /**
90
  * Consent not given - no cache
91
  */
99
  */
100
  if ( has_action( 'wp_head', 'caos_analytics_render_tracking_code' ) ||
101
  has_action( 'wp_head', 'caos_render_tracking_code' ) ||
102
+ has_action( 'wp_head', 'add_ga_header_script' ) ||
103
+ ( defined( 'CAOS_OPT_SCRIPT_POSITION' ) && CAOS_OPT_SCRIPT_POSITION != 'footer' ) ) {
104
  /**
105
  * Consent not given - no cache
106
  */
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.4.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.4.1' );
27
 
28
  /**
29
  * Register autoloader to load files/classes dynamically
addons/tests/integration/addons/test-caos-host-analyticsjs-local.php CHANGED
@@ -12,11 +12,12 @@ class Test_Caos_Host_Analyticsjs_Local extends \WP_UnitTestCase {
12
  * @since 2.1.0
13
  */
14
  public function test_host_analyticsjs_local() {
15
- $content = file_get_contents( 'http://plugins.svn.wordpress.org/host-analyticsjs-local/trunk/host-analyticsjs-local.php' );
16
 
17
  $this->assertNotFalse( strpos( $content,
18
- 'add_action(\'wp_footer\', \'caos_render_tracking_code\', CAOS_OPT_ENQUEUE_ORDER);' ) );
 
19
  $this->assertNotFalse( strpos( $content,
20
- 'add_action(\'wp_head\', \'caos_render_tracking_code\', CAOS_OPT_ENQUEUE_ORDER);' ) );
21
  }
22
  }
12
  * @since 2.1.0
13
  */
14
  public function test_host_analyticsjs_local() {
15
+ $content = file_get_contents( 'http://plugins.svn.wordpress.org/host-analyticsjs-local/trunk/includes/frontend/class-tracking.php' );
16
 
17
  $this->assertNotFalse( strpos( $content,
18
+ 'add_action(\'wp_footer\', array($this, \'render_tracking_code\'), CAOS_OPT_ENQUEUE_ORDER);' ) );
19
+
20
  $this->assertNotFalse( strpos( $content,
21
+ 'switch (CAOS_OPT_SCRIPT_POSITION) {' ) );
22
  }
23
  }
addons/tests/integration/addons/test-hubspot-leadin.php CHANGED
@@ -14,7 +14,7 @@ class Test_Hubspot_Leadin extends \WP_UnitTestCase {
14
  * @since 2.1.0
15
  */
16
  public function test_hook() {
17
- $content = file_get_contents( 'http://plugins.svn.wordpress.org/leadin/trunk/inc/class-leadin.php' );
18
 
19
  $this->assertNotFalse( strpos( $content, "const TRACKING_CODE_ID = 'leadin-script-loader-js';") );
20
  }
14
  * @since 2.1.0
15
  */
16
  public function test_hook() {
17
+ $content = file_get_contents( 'http://plugins.svn.wordpress.org/leadin/trunk/main/ClassLeadin.php' );
18
 
19
  $this->assertNotFalse( strpos( $content, "const TRACKING_CODE_ID = 'leadin-script-loader-js';") );
20
  }
cookiebot.php CHANGED
@@ -4,7 +4,7 @@ Plugin Name: Cookiebot | GDPR/CCPA Compliant Cookie Consent and Control
4
  Plugin URI: https://cookiebot.com/
5
  Description: Cookiebot is a cloud-driven solution that automatically controls cookies and trackers, enabling full GDPR/ePrivacy and CCPA compliance for websites.
6
  Author: Cybot A/S
7
- Version: 3.4.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.4.0';
25
 
26
  /**
27
  * @var Cookiebot_WP The single instance of the class
@@ -1283,10 +1283,12 @@ final class Cookiebot_WP {
1283
  */
1284
  function cookiebot_fix_plugin_conflicts() {
1285
  //Fix for Divi Page Builder
1286
- add_action( 'wp', array( $this, '_cookiebot_plugin_conflict_divi' ), 100 );
 
1287
 
1288
  //Fix for Elementor and WPBakery Page Builder Builder
1289
- add_filter( 'script_loader_tag', array( $this, '_cookiebot_plugin_conflict_scripttags' ), 10, 2 );
 
1290
 
1291
  }
1292
 
4
  Plugin URI: https://cookiebot.com/
5
  Description: Cookiebot is a cloud-driven solution that automatically controls cookies and trackers, enabling full GDPR/ePrivacy and CCPA compliance for websites.
6
  Author: Cybot A/S
7
+ Version: 3.4.1
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.4.1';
25
 
26
  /**
27
  * @var Cookiebot_WP The single instance of the class
1283
  */
1284
  function cookiebot_fix_plugin_conflicts() {
1285
  //Fix for Divi Page Builder
1286
+ //Disabled - using another method now (can_current_user_edit_theme())
1287
+ //add_action( 'wp', array( $this, '_cookiebot_plugin_conflict_divi' ), 100 );
1288
 
1289
  //Fix for Elementor and WPBakery Page Builder Builder
1290
+ //Disabled - using another method now (can_current_user_edit_theme())
1291
+ //add_filter( 'script_loader_tag', array( $this, '_cookiebot_plugin_conflict_scripttags' ), 10, 2 );
1292
 
1293
  }
1294
 
readme.txt CHANGED
@@ -3,7 +3,7 @@
3
  * Tags: cookie, compliance, eu, gdpr, europe, cookie consent, consent, ccpa
4
  * Requires at least: 4.4
5
  * Tested up to: 5.2
6
- * Stable tag: 3.4.0
7
  * Requires PHP: 5.6
8
  * License: GPLv2 or later
9
 
@@ -185,6 +185,10 @@ Cookiebot works with GTM, however you need to enable the "Hide Cookie Popup" opt
185
 
186
  ## Changelog ##
187
 
 
 
 
 
188
  ### 3.4.0 - 2019-12-13 ###
189
  * Removing Cookiebot when in auto mode and the user is logged in and has a edit themes capability
190
  * Adding filter for regexp for fixing embedded media
3
  * Tags: cookie, compliance, eu, gdpr, europe, cookie consent, consent, ccpa
4
  * Requires at least: 4.4
5
  * Tested up to: 5.2
6
+ * Stable tag: 3.4.1
7
  * Requires PHP: 5.6
8
  * License: GPLv2 or later
9
 
185
 
186
  ## Changelog ##
187
 
188
+ ### 3.4.1 - 2020-01-28 ###
189
+ * Removing manual fixes for Cookiebot when in auto
190
+ * Adjustments and updates to addons
191
+
192
  ### 3.4.0 - 2019-12-13 ###
193
  * Removing Cookiebot when in auto mode and the user is logged in and has a edit themes capability
194
  * Adding filter for regexp for fixing embedded media