Changeset 3744556 for cookie-notice/trunk/includes/settings.php

Timestamp:

10/13/2026 05:31:48 PM (3 weeks ago)

Author:

humanityco

Message:

Release 3.1.16 — simpler, more reliable privacy policy link; tested up to WordPress 7.1

File:

• cookie-notice/trunk/includes/settings.php (modified) (3 diffs)

cookie-notice/trunk/includes/settings.php

@@ -2453 +2453 @@
         /**
          * Point the WordPress privacy policy page at the banner's policy page, when synced.
+         * With no page chosen (id 0) the site's existing privacy page is kept, never cleared.
          *
          * @param array $options Full (merged) options
@@ -2458 +2459 @@
          */
         public function sync_privacy_policy_page( $options ) {
-                if ( $options['see_more_opt']['link_type'] === 'page' && $options['see_more_opt']['sync'] )
+                if ( $options['see_more_opt']['link_type'] === 'page' && $options['see_more_opt']['sync'] && (int) $options['see_more_opt']['id'] > 0 )
                         update_option( 'wp_page_for_privacy_policy', $options['see_more_opt']['id'] );
         }
@@ -2471 +2472 @@
                 if ( $options['see_more'] && $options['link_position'] === 'message' && strpos( $options['message_text'], '[cookies_policy_link' ) === false )
                         $options['message_text'] .= ' [cookies_policy_link]';
+                // Link position "banner": drop a bare trailing [cookies_policy_link] (left from "message" position; one the admin typed there is dropped too). Mid-message shortcodes and ones with attributes stay.
+                elseif ( $options['see_more'] && $options['link_position'] === 'banner' )
+                        $options['message_text'] = rtrim( preg_replace( '/ \[cookies_policy_link\]\s*$/', '', $options['message_text'] ) );
 
                 return $options;