Ticket #31985: 31985.9.diff

src/wp-includes/class-wp-network.php

@@ -129 +129 @@
                         $this->$key = $value;
                 }
 
+                $this->_set_site_name();
                 $this->_set_cookie_domain();
         }
 
         /**
+         * Set the site name assigned to the network if one has not been populated.
+         *
+         * @since 4.4.0
+         * @access private
+         */
+        private function _set_site_name() {
+                if ( ! empty( $this->site_name ) ) {
+                        return;
+                }
+
+                $default = ucfirst( $this->domain );
+                $this->site_name = get_network_option( 'site_name', $default, $this->id );
+        }
+
+        /**
          * Set the cookie domain based on the network domain if one has
          * not been populated.
          *

src/wp-includes/ms-settings.php

@@ -221 +221 @@
         $current_site = new WP_Network( $current_site );
 }
 
-if ( empty( $current_site->site_name ) ) {
-        $current_site->site_name = get_network_option( 'site_name' );
-        if ( ! $current_site->site_name ) {
-                $current_site->site_name = ucfirst( $current_site->domain );
-        }
-}
-
 // Define upload directory constants
 ms_upload_constants();