Changeset 34819 for trunk/src/wp-includes/class-wp-network.php

Timestamp:

10/04/2015 08:50:48 PM (10 years ago)

Author:

jeremyfelt

Message:

MS: Populate site_name property in a new WP_Network.

This allows us to reduce some extra handling in ms-settings.php. Requires [34777].

Props johnjamesjacoby for the initial patch.
See #31985.

File:

• trunk/src/wp-includes/class-wp-network.php (modified) (1 diff)

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

@@ -130 +130 @@
         }
 
+        $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 );
     }