update to core

class-document.php

@@ -3056,6 +3056,9 @@ private function delete_files_directories_recursively( $dir ) {
 		 * @return string
 		 */
 		public function revert_divs_to_summary( $content ): string {
+			// Make sure content is a string
+			$content = $content ?? '';
+
 			//only on front-end
 			if ( is_admin() ) {
 				return $content;

complianz-gpdr.php

@@ -3,7 +3,7 @@
  * Plugin Name: Complianz | GDPR/CCPA Cookie Consent
  * Plugin URI: https://www.wordpress.org/plugins/complianz-gdpr
  * Description: Complianz Privacy Suite for GDPR, CaCPA, DSVGO, AVG with a conditional cookie warning and customized cookie policy
- * Version: 6.4.6
+ * Version: 6.4.7
  * Requires at least: 4.9
  * Requires PHP: 7.2
  * Text Domain: complianz-gdpr
@@ -141,7 +141,7 @@ private function setup_constants() {
 			//for auto upgrade functionality
 			define( 'cmplz_plugin_free', plugin_basename( __FILE__ ) );
 			$debug = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ? time() : '';
-			define( 'cmplz_version', '6.4.6' . $debug );
+			define( 'cmplz_version', '6.4.7' . $debug );
 			define( 'cmplz_plugin_file', __FILE__ );
 		}
 

config/documents/cookie-policy-uk.php

@@ -81,32 +81,32 @@
 	),
 
 	array(
-		'subtitle' => _x('Social media', 'Legal document cookie policy:paragraph title', 'complianz-gdpr'),
-		'content' => _x('On our website, we have included content to promote web pages (e.g. “like”, “pin”) or share (e.g. “tweet”) on social networks. This content is embedded with code derived from third parties and places cookies. This content might store and process certain information for personalized advertising.', 'Legal document cookie policy', 'complianz-gdpr'),
+		'subtitle' => 'Social media',
+		'content' => 'On our website, we have included content to promote web pages (e.g. “like”, “pin”) or share (e.g. “tweet”) on social networks. This content is embedded with code derived from third parties and places cookies. This content might store and process certain information for personalized advertising.', 'Legal document cookie policy',
 		'condition' => array(
 			'uses_social_media' => 'yes',
 			'socialmedia_on_site' => 'EMPTY',
 		),
 	),
 	array(
-		'subtitle' => _x('Social media', 'Legal document cookie policy:paragraph title', 'complianz-gdpr'),
-		'content' => cmplz_sprintf(_x('On our website, we have included content from %s to promote web pages (e.g. “like”, “pin”) or share (e.g. “tweet”) on social networks like %s. This content is embedded with code derived from %s and places cookies. This content might store and process certain information for personalized advertising.', 'Legal document cookie policy', 'complianz-gdpr'), '[comma_socialmedia_on_site]', '[comma_socialmedia_on_site]', '[comma_socialmedia_on_site]'),
+		'subtitle' => 'Social media', 'Legal document cookie policy:paragraph title',
+		'content' => cmplz_sprintf('On our website, we have included content from %s to promote web pages (e.g. “like”, “pin”) or share (e.g. “tweet”) on social networks like %s. This content is embedded with code derived from %s and places cookies. This content might store and process certain information for personalized advertising.', 'Legal document cookie policy', '[comma_socialmedia_on_site]', '[comma_socialmedia_on_site]', '[comma_socialmedia_on_site]'),
 		'condition' => array(
 			'uses_social_media' => 'yes',
 			'socialmedia_on_site' => 'NOT EMPTY',
 		),
 	),
 
 	array(
-		'content' => __('Please read the privacy statement of these social networks (which can change regularly) to read what they do with your (personal) data which they process using these cookies. The data that is retrieved is anonymized as much as possible.','complianz-gdpr').' '.cmplz_sprintf( _n( '%s is located in the United States.', '%s are located in the United States.',  cmplz_count_socialmedia(), 'complianz-gdpr'  ) ,'[comma_socialmedia_on_site]' ),
+		'content' => 'Please read the privacy statement of these social networks (which can change regularly) to read what they do with your (personal) data which they process using these cookies. The data that is retrieved is anonymized as much as possible.' . ' '.cmplz_sprintf( '%s is located in the United States.', '%s are located in the United States.',  cmplz_count_socialmedia(),'[comma_socialmedia_on_site]' ),
 		'condition' => array(
 			'uses_social_media' => 'yes',
 			'socialmedia_on_site' => 'NOT EMPTY',
 		),
 	),
 
 	array(
-		'content' => __('Please read the privacy statement of these social networks (which can change regularly) to read what they do with your (personal) data which they process using these cookies. The data that is retrieved is anonymized as much as possible.','complianz-gdpr'),
+		'content' => 'Please read the privacy statement of these social networks (which can change regularly) to read what they do with your (personal) data which they process using these cookies. The data that is retrieved is anonymized as much as possible.',
 		'condition' => array(
 			'uses_social_media' => 'yes',
 			'socialmedia_on_site' => 'EMPTY',
@@ -145,21 +145,20 @@
 
 	array(
 		'p' => false,
-		'subtitle' => _x('Vendors', 'Legal document cookie policy:paragraph title', 'complianz-gdpr'),
+		'subtitle' => 'Vendors',
 		'content' => '[cmplz-tcf-vendors]',
 		'callback_condition' => 'cmplz_tcf_active',
 	),
 
 	'enable-disable-removal-cookies' => array(
-		'title' => _x('Enabling/disabling and deleting cookies', 'Legal document cookie policy:paragraph title', 'complianz-gdpr'),
-		'content' => _x('You can use your internet browser to automatically or manually delete cookies. You can also specify that certain cookies may not be placed. Another option is to change the settings of your internet browser so that you receive a message each time a cookie is placed. For more information about these options, please refer to the instructions in the Help section of your browser.',  'Legal document cookie policy','complianz-gdpr'),
+		'title' => 'Enabling/disabling and deleting cookies', 'Legal document cookie policy:paragraph title',
+		'content' => 'You can use your internet browser to automatically or manually delete cookies. You can also specify that certain cookies may not be placed. Another option is to change the settings of your internet browser so that you receive a message each time a cookie is placed. For more information about these options, please refer to the instructions in the Help section of your browser.',
 	),
 
 	'enable-disable-removal-cookies-2' => array(
-		'content' => _x('Please note that our website may not work properly if all cookies are disabled. If you do delete the cookies in your browser, they will be placed again after your consent when you visit our website again.', 'Legal document cookie policy', 'complianz-gdpr'),
+		'content' => 'Please note that our website may not work properly if all cookies are disabled. If you do delete the cookies in your browser, they will be placed again after your consent when you visit our website again.',
 	),
 
-
 	'your-rights' => array(
         'title' => 'Your rights with respect to personal data',
         'content' =>

config/general-settings.php

@@ -99,7 +99,7 @@
 			'translatable' => true,
 			'label'        => __( "Blocked content text", 'complianz-gdpr' ),
 			'default'      => cmplz_sprintf(__( 'Click to accept %s cookies and enable this content', 'complianz-gdpr' ), '{category}'),
-			'tooltip'      => __( 'The blocked content text appears when for example a Youtube video is embedded.', 'complianz-gdpr' ),
+			'tooltip'      => __( 'The blocked content text appears when for example a YouTube video is embedded.', 'complianz-gdpr' ),
 			'help'      => __( 'Do not change or translate the {category} string.', 'complianz-gdpr' ).' '.__( 'You may remove it if you want.', 'complianz-gdpr' ).' '.__( 'It will be replaced with the name of the category that is blocked.', 'complianz-gdpr' ),
 			'condition'    => array(
 				'safe_mode' => false,
@@ -116,7 +116,7 @@
 			'translatable' => true,
 			'label'        => __( "Blocked content text", 'complianz-gdpr' ),
 			'default'      => cmplz_sprintf(__( "Click 'I agree' to enable %s", 'complianz-gdpr' ), '{service}'),
-			'tooltip'      => __( 'The blocked content text appears when for example a Youtube video is embedded.', 'complianz-gdpr' ),
+			'tooltip'      => __( 'The blocked content text appears when for example a YouTube video is embedded.', 'complianz-gdpr' ),
 			'help'      => __( 'Do not change or translate the {service} string.', 'complianz-gdpr' ).' '.__( 'You may remove it if you want.', 'complianz-gdpr' ).' '.__( 'It will be replaced with the name of the service that is blocked.', 'complianz-gdpr' ),
 			'condition'    => array(
 				'safe_mode' => false,
@@ -133,7 +133,7 @@
 			'translatable' => true,
 			'label'        => __( "Text on 'I agree' button", 'complianz-gdpr' ),
 			'default'      => __( "I agree", 'complianz-gdpr' ),
-			'tooltip'      => __( 'The blocked content text appears when for example a Youtube video is embedded.', 'complianz-gdpr' ),
+			'tooltip'      => __( 'The blocked content text appears when for example a YouTube video is embedded.', 'complianz-gdpr' ),
 			'condition'    => array(
 				'safe_mode' => false,
 			),

cookie/class-cookie-admin.php

@@ -2017,7 +2017,7 @@ public function add_gtag_js() {
 
 			$statistics = cmplz_get_value( 'compile_statistics' );
 			$gtag_code  = esc_attr( cmplz_get_value( "UA_code" ) );
-			if ( $statistics === 'google-analytics' ) {
+			if ( $statistics === 'google-analytics' && !empty($gtag_code) ) {
 				$category = $this->get_statistics_category();
 				?>
 				<script async data-category="<?php echo $category ?>" src="https://www.googletagmanager.com/gtag/js?id=<?php echo $gtag_code ?>"></script><?php

functions.php

@@ -2358,7 +2358,7 @@ function cmplz_get_server() {
 		} elseif ( strpos( $server_raw, 'nginx' ) !== false ) {
 			return 'NGINX';
 		} elseif ( strpos( $server_raw, 'litespeed' ) !== false ) {
-			return 'Litespeed';
+			return 'LiteSpeed';
 		} else { //unsupported server
 			return 'Not recognized';
 		}

integrations/integrations.php

@@ -70,19 +70,23 @@ function cmplz_enqueue_integrations_assets( $hook ) {
 			'label'                => 'Lead Forensics',
 			'firstparty_marketing' => false,
 	),
-
 	'mailchimp-woocommerce' => array(
 			'constant_or_function' => 'MAILCHIMP_WOOCOMMERCE_NEWSLETTER_VERSION',
 			'label'                => 'Mailchimp for Woocommerce',
 			'firstparty_marketing' => false,
 	),
-
 	'burst-statistics' => array(
 			'constant_or_function' => 'burst_version',
 			'label'                => 'Burst Statistics',
 			'firstparty_marketing' => false,
 	),
 
+	'beaver-builder' => array(
+			'constant_or_function' => 'FL_BUILDER_VERSION',
+			'label'                => 'Beaver Builder',
+			'firstparty_marketing' => false,
+	),
+
 	'theeventscalendar' => array(
 			'constant_or_function' => 'TRIBE_EVENTS_FILE',
 			'label'                => 'The Events Calendar',
@@ -361,7 +365,7 @@ function cmplz_enqueue_integrations_assets( $hook ) {
 
 	'jetpack' => array(
 		'constant_or_function' => 'JETPACK__VERSION',
-		'label'                => 'JetPack',
+		'label'                => 'Jetpack',
 		'firstparty_marketing' => false,
 	),
 

integrations/plugins/beaver-builder.php

@@ -0,0 +1,8 @@
+<?php
+defined( 'ABSPATH' ) or die( "you do not have access to this page!" );
+
+function cmplz_beaver_builder_whitelist($tags){
+	$tags[] = 'FLBuilderLayout';
+	return $tags;
+}
+add_filter( 'cmplz_whitelisted_script_tags', 'cmplz_beaver_builder_whitelist');

languages/complianz-gdpr.pot

@@ -2,14 +2,14 @@
 # This file is distributed under the same license as the Complianz Privacy Suite (GDPR/CCPA) premium plugin.
 msgid ""
 msgstr ""
-"Project-Id-Version: Complianz Privacy Suite (GDPR/CCPA) premium 6.4.8\n"
+"Project-Id-Version: Complianz Privacy Suite (GDPR/CCPA) premium 6.4.9\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/complianz-gdpr-premium\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2023-05-26T15:41:54+00:00\n"
+"POT-Creation-Date: 2023-06-13T18:51:55+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.7.1\n"
 "X-Domain: complianz-gdpr\n"
@@ -729,7 +729,7 @@ msgstr ""
 
 #: class-field.php:2514
 #: class-field.php:2863
-#: integrations/integrations.php:822
+#: integrations/integrations.php:826
 #: gutenberg/build/index.js:1
 #: gutenberg/src/index.js:463
 msgid "Placeholder"
@@ -2252,7 +2252,6 @@ msgstr ""
 #: config/documents/cookie-policy-br.php:103
 #: config/documents/cookie-policy-ca.php:104
 #: config/documents/cookie-policy-eu.php:103
-#: config/documents/cookie-policy-uk.php:101
 #: config/documents/cookie-policy-us.php:138
 #: config/documents/cookie-policy-za.php:102
 msgid "%s is located in the United States."
@@ -2442,8 +2441,6 @@ msgstr ""
 #: config/documents/cookie-policy-ca.php:95
 #: config/documents/cookie-policy-eu.php:86
 #: config/documents/cookie-policy-eu.php:94
-#: config/documents/cookie-policy-uk.php:84
-#: config/documents/cookie-policy-uk.php:92
 #: config/documents/cookie-policy-us.php:121
 #: config/documents/cookie-policy-us.php:129
 #: config/documents/cookie-policy-za.php:85
@@ -2455,7 +2452,6 @@ msgstr ""
 #: config/documents/cookie-policy-br.php:87
 #: config/documents/cookie-policy-ca.php:88
 #: config/documents/cookie-policy-eu.php:87
-#: config/documents/cookie-policy-uk.php:85
 #: config/documents/cookie-policy-us.php:122
 #: config/documents/cookie-policy-za.php:86
 msgctxt "Legal document cookie policy"
@@ -2465,7 +2461,6 @@ msgstr ""
 #: config/documents/cookie-policy-br.php:95
 #: config/documents/cookie-policy-ca.php:96
 #: config/documents/cookie-policy-eu.php:95
-#: config/documents/cookie-policy-uk.php:93
 #: config/documents/cookie-policy-us.php:130
 #: config/documents/cookie-policy-za.php:94
 msgctxt "Legal document cookie policy"
@@ -2478,8 +2473,6 @@ msgstr ""
 #: config/documents/cookie-policy-ca.php:112
 #: config/documents/cookie-policy-eu.php:103
 #: config/documents/cookie-policy-eu.php:111
-#: config/documents/cookie-policy-uk.php:101
-#: config/documents/cookie-policy-uk.php:109
 #: config/documents/cookie-policy-us.php:138
 #: config/documents/cookie-policy-us.php:146
 #: config/documents/cookie-policy-za.php:102
@@ -2531,7 +2524,6 @@ msgstr ""
 #: config/documents/cookie-policy-br.php:148
 #: config/documents/cookie-policy-ca.php:137
 #: config/documents/cookie-policy-eu.php:150
-#: config/documents/cookie-policy-uk.php:148
 #: config/documents/cookie-policy-za.php:149
 msgctxt "Legal document cookie policy:paragraph title"
 msgid "Vendors"
@@ -2540,22 +2532,19 @@ msgstr ""
 #: config/documents/cookie-policy-br.php:155
 #: config/documents/cookie-policy-ca.php:152
 #: config/documents/cookie-policy-eu.php:157
-#: config/documents/cookie-policy-uk.php:154
 msgctxt "Legal document cookie policy:paragraph title"
 msgid "Enabling/disabling and deleting cookies"
 msgstr ""
 
 #: config/documents/cookie-policy-br.php:156
 #: config/documents/cookie-policy-eu.php:158
-#: config/documents/cookie-policy-uk.php:155
 msgctxt "Legal document cookie policy"
 msgid "You can use your internet browser to automatically or manually delete cookies. You can also specify that certain cookies may not be placed. Another option is to change the settings of your internet browser so that you receive a message each time a cookie is placed. For more information about these options, please refer to the instructions in the Help section of your browser."
 msgstr ""
 
 #: config/documents/cookie-policy-br.php:160
 #: config/documents/cookie-policy-ca.php:158
 #: config/documents/cookie-policy-eu.php:162
-#: config/documents/cookie-policy-uk.php:159
 #: config/documents/cookie-policy-us.php:192
 #: config/documents/cookie-policy-za.php:160
 msgctxt "Legal document cookie policy"
@@ -2978,7 +2967,7 @@ msgstr ""
 #: config/general-settings.php:102
 #: config/general-settings.php:119
 #: config/general-settings.php:136
-msgid "The blocked content text appears when for example a Youtube video is embedded."
+msgid "The blocked content text appears when for example a YouTube video is embedded."
 msgstr ""
 
 #: config/general-settings.php:103
@@ -5248,11 +5237,11 @@ msgstr ""
 msgid "Integrations"
 msgstr ""
 
-#: integrations/integrations.php:854
+#: integrations/integrations.php:858
 msgid "We have enabled integrations for plugins and services, please double-check your configuration."
 msgstr ""
 
-#: integrations/integrations.php:995
+#: integrations/integrations.php:999
 msgid "No required integrations detected yet."
 msgstr ""
 
@@ -5515,23 +5504,23 @@ msgstr ""
 msgid "As of WordPress 4.9.6, plugins and themes can add their own suggested statements about cookie usage and privacy here. To use this functionality, please upgrade to the latest WordPress version."
 msgstr ""
 
-#: pro/class-document.php:89
+#: pro/class-document.php:93
 msgid "Add to annex of Privacy Statement"
 msgstr ""
 
-#: pro/class-document.php:107
+#: pro/class-document.php:111
 msgid "Conforms to the Consent API"
 msgstr ""
 
-#: pro/class-document.php:108
+#: pro/class-document.php:112
 msgid "Does not conform with the Consent API"
 msgstr ""
 
-#: pro/class-document.php:115
+#: pro/class-document.php:119
 msgid "No plugins with suggested statements found."
 msgstr ""
 
-#: pro/class-geoip.php:373
+#: pro/class-geoip.php:374
 msgid "Required directory does not exist:"
 msgstr ""
 

readme.txt

@@ -6,7 +6,7 @@ Requires at least: 4.9
 License: GPL2
 Requires PHP: 7.2
 Tested up to: 6.2
-Stable tag: 6.4.6
+Stable tag: 6.4.7
 
 Configure your Cookie Banner, Cookie Consent and Cookie Policy with our Wizard and Cookie Scan. Supports GDPR, DSGVO, TTDSG, LGPD, POPIA, RGPD, CCPA/CPRA and PIPEDA.
 
@@ -174,6 +174,13 @@ The Brazilian General Data Protection Law is similar to the GDPR, the UK-GDPR it
 With some custom CSS this is possible, but we do not consider a cookie wall to be GDPR compliant, so it's not actively supported. We do, however, have the option to create a Soft Cookie Wall. Which blocks interaction with the website, but dismissing remains a possibility.
 
 == Changelog ==
+= 6.4.7 =
+* June 14th, 2023
+* Fix: WordPress 6.2 version moved the Privacy Policy function to a different file. Added fallback for older versions.
+* Fix: The fix for the Classic Editor bug which removes summary/details html elements, caused an issue when the post content is empty.
+* Improvement: if configuration by Complianz is set to false, the gtag id was added anyway, but empty.
+* Improvement: strings in UK cookie policy translatable, which shouldn't be the case.
+
 = 6.4.6 =
 * Improvement: unhide pagination on data requests page.
 * Improvement: Jersey and Guernsey included

templates/dashboard/other-plugins.php

@@ -4,9 +4,9 @@
 
 $plugins = array(
 	'BURST' => array(
-			'constant_free' => 'burst_version',
-			'constant_premium' => 'burst_version',
-			'website' => 'https://burst-statistics.com/',
+			'constant_free' => 'burst_free',
+			'constant_premium' => 'burst_pro',
+			'website' => 'https://burst-statistics.com/pricing?src=complianz-plugin',
 			'search' => 'burst+statistics+really+simple+plugins+self-hosted',
 			'url' => 'https://wordpress.org/plugins/burst-statistics/?src=complianz-plugin',
 			'title' => 'Burst Statistics - '. __("Self-hosted, Privacy-friendly analytics tool.", "complianz-gdpr"),