Ticket #43954: 43954.diff

src/wp-admin/includes/admin-filters.php

@@ -138 +138 @@
 add_action( 'wp_privacy_personal_data_export_file', 'wp_privacy_generate_personal_data_export_file', 10 );
 
 // Privacy policy text changes check.
-add_action( 'admin_init', array( 'WP_Privacy_Policy_Content', 'text_change_check' ), 20 );
+//add_action( 'admin_init', array( 'WP_Privacy_Policy_Content', 'text_change_check' ), 20 );
 
 // Show a "postbox" with the text suggestions for a privacy policy.
 add_action( 'edit_form_after_title', array( 'WP_Privacy_Policy_Content', 'notice' ) );

src/wp-admin/includes/misc.php

@@ -1320 +1320 @@
 
                 // The site doesn't have a privacy policy.
                 if ( empty( $policy_page_id ) ) {
-                        return;
+                        return false;
                 }
 
                 if ( ! current_user_can( 'edit_post', $policy_page_id ) ) {
-                        return;
+                        return false;
                 }
 
-                // Also run when the option doesn't exist yet.
-                if ( get_option( '_wp_privacy_text_change_check' ) === 'no-check' ) {
-                        return;
-                }
+//              // Also run when the option doesn't exist yet.
+//              if ( get_option( '_wp_privacy_text_change_check' ) === 'no-check' ) {
+//                      return true;
+//              }
 
                 $old = (array) get_post_meta( $policy_page_id, '_wp_suggested_privacy_policy_content' );
                 $new = self::$policy_content;
@@ -1346 +1346 @@
                 // The == operator (equal, not identical) was used intentionally.
                 // See http://php.net/manual/en/language.operators.array.php
                 if ( $new != $old ) {
-                        // A plugin was activated or deactivated, or some policy text has changed.
-                        // Show a notice on all screens in wp-admin.
-                        add_action( 'admin_notices', array( 'WP_Privacy_Policy_Content', 'policy_text_changed_notice' ) );
+                        return true;
                 } else {
-                        // Stop checking.
-                        update_option( '_wp_privacy_text_change_check', 'no-check' );
+                        return false;
                 }
         }
 
@@ -1360 +1357 @@
          *
          * @since 4.9.6
          */
-        public static function policy_text_changed_notice() {
+        public static function x_policy_text_changed_notice() {
+                return;
                 global $post;
+
                 $policy_page_id = (int) get_option( 'wp_page_for_privacy_policy' );
+                $relevant_screens = array( 'privacy', 'edit-page' );
+                $current_screen   = get_current_screen();
+var_dump($current_screen);wp_die();
+                // if on privacy policy page, then show, b/c otherwise nothing on that page says it
+
+                if ( ! is_a( $current_screen, 'WP_Screen' ) ) {
+                        return;
+                }
+
+                if ( ! in_array( $current_screen->id, $relevant_screens, true ) ) {
+                        return;
+                }
 
                 ?>
                 <div class="policy-text-updated notice notice-warning is-dismissible">

src/wp-admin/menu.php

@@ -263 +263 @@
         $submenu['tools.php'][50] = array( __( 'Network Setup' ), 'setup_network', 'network.php' );
 }
 
-$menu[80]                               = array( __( 'Settings' ), 'manage_options', 'options-general.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings' );
+$policy_change_notice = current_user_can( 'manage_privacy_options' ) && WP_Privacy_Policy_Content::text_change_check()
+        ? " <span class='update-plugins count-1}'><span class='plugin-count'>" . number_format_i18n( 1 ) . '</span></span>'
+        : '';
+$menu[80]                               = array( __( 'Settings' . $policy_change_notice ), 'manage_options', 'options-general.php', '', 'menu-top menu-icon-settings', 'menu-settings', 'dashicons-admin-settings' );
         $submenu['options-general.php'][10] = array( _x( 'General', 'settings screen' ), 'manage_options', 'options-general.php' );
         $submenu['options-general.php'][15] = array( __( 'Writing' ), 'manage_options', 'options-writing.php' );
         $submenu['options-general.php'][20] = array( __( 'Reading' ), 'manage_options', 'options-reading.php' );
         $submenu['options-general.php'][25] = array( __( 'Discussion' ), 'manage_options', 'options-discussion.php' );
         $submenu['options-general.php'][30] = array( __( 'Media' ), 'manage_options', 'options-media.php' );
         $submenu['options-general.php'][40] = array( __( 'Permalinks' ), 'manage_options', 'options-permalink.php' );
-        $submenu['options-general.php'][45] = array( __( 'Privacy' ), 'manage_privacy_options', 'privacy.php' );
+        $submenu['options-general.php'][45] = array( __( 'Privacy' ) . $policy_change_notice, 'manage_privacy_options', 'privacy.php' );
 
 $_wp_last_utility_menu = 80; // The index of the last top-level menu in the utility menu group