Ticket #35288: 35288.diff

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

@@ -12 +12 @@
 
 // Dashboard hooks.
 add_action( 'activity_box_end', 'wp_dashboard_quota' );
+add_action( 'admin_notices',     'privacy_on_notice' );
 
 // Media hooks.
 add_action( 'attachment_submitbox_misc_actions', 'attachment_submitbox_metadata' );

src/wp-admin/includes/dashboard.php

@@ -303 +303 @@
         </ul>
         <?php
         update_right_now_message();
-
-        // Check if search engines are asked not to index this site.
-        if ( ! is_network_admin() && ! is_user_admin() && current_user_can( 'manage_options' ) && '0' == get_option( 'blog_public' ) ) {
-
-                /**
-                 * Filter the link title attribute for the 'Search Engines Discouraged'
-                 * message displayed in the 'At a Glance' dashboard widget.
-                 *
-                 * Prior to 3.8.0, the widget was named 'Right Now'.
-                 *
-                 * @since 3.0.0
-                 * @since 4.5.0 The default for `$title` was updated to an empty string.
-                 *
-                 * @param string $title Default attribute text.
-                 */
-                $title = apply_filters( 'privacy_on_link_title', '' );
-
-                /**
-                 * Filter the link label for the 'Search Engines Discouraged' message
-                 * displayed in the 'At a Glance' dashboard widget.
-                 *
-                 * Prior to 3.8.0, the widget was named 'Right Now'.
-                 *
-                 * @since 3.0.0
-                 *
-                 * @param string $content Default text.
-                 */
-                $content = apply_filters( 'privacy_on_link_text' , __( 'Search Engines Discouraged' ) );
-                $title_attr = '' === $title ? '' : " title='$title'";
-
-                echo "<p><a href='options-reading.php'$title_attr>$content</a></p>";
-        }
         ?>
         </div>
         <?php

src/wp-admin/includes/template.php

@@ -2084 +2084 @@
 function _wp_posts_page_notice() {
         echo '<div class="notice notice-warning inline"><p>' . __( 'You are currently editing the page that shows your latest posts.' ) . '</p></div>';
 }
+
+/**
+ * Displays an admin notice if search engines are asked not to index this site.
+ *
+ * @since 4.6.0
+ *
+ * @global $pagenow
+ */
+function privacy_on_notice() {
+        global $pagenow;
+
+        // Check if search engines are asked not to index this site.
+        if ( 'index.php' === $pagenow && ! is_network_admin() && ! is_user_admin() && current_user_can( 'manage_options' ) && '0' == get_option( 'blog_public' ) ) {
+                $msg = __( 'Search engines are currently being discouraged from indexing this site.  <a href="options-reading.php">Change</a>.' );
+
+                echo "<div id='notice' class='notice notice-warning'><p>$msg</p></div>";
+        }
+}