Ticket #59818: kitchin59818.alt.diff

src/wp-admin/includes/dashboard.php

@@ -371 +371 @@
 
         // Check if search engines are asked not to index this site.
         if ( ! is_network_admin() && ! is_user_admin()
-                && current_user_can( 'manage_options' ) && ! get_option( 'blog_public' )
+                && current_user_can( 'manage_options' ) && 1 !== get_option( 'blog_public' )
         ) {
 
                 /**

src/wp-admin/options.php

@@ -179 +179 @@
         $allowed_options['general'][] = 'default_role';
 
         $allowed_options['writing']   = array_merge( $allowed_options['writing'], $mail_options );
-        $allowed_options['writing'][] = 'ping_sites';
 
+        if ( '1' === get_option( 'blog_public' ) ) {
+                $allowed_options['writing'][] = 'ping_sites';
+        }
+
         $allowed_options['media'][] = 'uploads_use_yearmonth_folders';
 
         /*

src/wp-includes/comment.php

@@ -3155 +3155 @@
  * @return mixed Empty string if blog is not public, returns $sites, if site is public.
  */
 function privacy_ping_filter( $sites ) {
-        if ( '0' != get_option( 'blog_public' ) ) {
+        if ( '1' === get_option( 'blog_public' ) ) {
                 return $sites;
         } else {
                 return '';

src/wp-includes/deprecated.php

@@ -4145 +4145 @@
         _deprecated_function( __FUNCTION__, '5.7.0', 'wp_robots_noindex()' );
 
         // If the blog is not public, tell robots to go away.
-        if ( '0' == get_option( 'blog_public' ) ) {
+        if ( '1' !== get_option( 'blog_public' ) ) {
                 wp_no_robots();
         }
 }
@@ -4166 +4166 @@
 function wp_no_robots() {
         _deprecated_function( __FUNCTION__, '5.7.0', 'wp_robots_no_robots()' );
 
-        if ( get_option( 'blog_public' ) ) {
+        if ( '1' === get_option( 'blog_public' ) ) {
                 echo "<meta name='robots' content='noindex,follow' />\n";
                 return;
         }

src/wp-includes/functions.php

@@ -1707 +1707 @@
         do_action( 'do_robotstxt' );
 
         $output = "User-agent: *\n";
-        $public = get_option( 'blog_public' );
+        $public = (bool) get_option( 'blog_public' );
 
         $site_url = parse_url( site_url() );
         $path     = ( ! empty( $site_url['path'] ) ) ? $site_url['path'] : '';

src/wp-includes/robots-template.php

@@ -68 +68 @@
  * @return array Filtered robots directives.
  */
 function wp_robots_noindex( array $robots ) {
-        if ( ! get_option( 'blog_public' ) ) {
+        if ( '1' !== get_option( 'blog_public' ) ) {
                 return wp_robots_no_robots( $robots );
         }
 
@@ -140 +140 @@
 function wp_robots_no_robots( array $robots ) {
         $robots['noindex'] = true;
 
-        if ( get_option( 'blog_public' ) ) {
+        if ( '1' === get_option( 'blog_public' ) ) {
                 $robots['follow'] = true;
         } else {
                 $robots['nofollow'] = true;
@@ -186 +186 @@
  * @return array Filtered robots directives.
  */
 function wp_robots_max_image_preview_large( array $robots ) {
-        if ( get_option( 'blog_public' ) ) {
+        if ( '1' === get_option( 'blog_public' ) ) {
                 $robots['max-image-preview'] = 'large';
         }
         return $robots;

src/wp-signup.php

@@ -199 +199 @@
 
                 $blog_public_on_checked  = '';
                 $blog_public_off_checked = '';
-        if ( isset( $_POST['blog_public'] ) && '0' === $_POST['blog_public'] ) {
+        if ( isset( $_POST['blog_public'] ) && '1' !== $_POST['blog_public'] ) {
                 $blog_public_off_checked = 'checked="checked"';
         } else {
                 $blog_public_on_checked = 'checked="checked"';