Ticket #31985: 31985.2.diff

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

@@ +1 @@
+<?php
+
+/**
+ * Main network class
+ *
+ * This class contains the values and functional methods for interacting with
+ * a network of WordPress sites. Traditionally used for multisite, this class
+ * is used by the $current_site global to setup the current network
+ *
+ * This class is most useful in WordPress multi-network installations where the
+ * ability to interact with any network of sites is required.
+ *
+ * @since 4.3.0
+ */
+class WP_Network {
+
+        /**
+         * Unique numerical ID.
+         *
+         * @since 4.3.0
+         *
+         * @var int
+         */
+        public $id = 0;
+
+        /**
+         * Domain of this network.
+         *
+         * @since 4.3.0
+         *
+         * @var string
+         */
+        public $domain = '';
+
+        /**
+         * Path of this network.
+         *
+         * @since 4.3.0
+         *
+         * @var string
+         */
+        public $path = '';
+
+        /**
+         * The ID of the main site mapped to this network.
+         *
+         * Named "blog" vs. "site" for legacy reasons.
+         *
+         * @since 4.3.0
+         *
+         * @var int
+         */
+        public $blog_id = 0;
+
+        /**
+         * Domain used for cookies for this network.
+         *
+         * @since 4.3.0
+         *
+         * @var int
+         */
+        public $cookie_domain = '';
+
+        /**
+         * Create a new WP_Network object
+         *
+         * Will populate all relevant data if a network ID or object is passed
+         *
+         * @since 4.3.0
+         *
+         * @param mixed $network stdClass object or network ID
+         */
+        public function __construct( $network = false ) {
+
+                // Bail if not populating from an existing network.
+                if ( empty( $network ) ) {
+                        return false;
+                }
+
+                // Get the network ID.
+                if ( is_object( $network ) && isset( $network->id ) ) {
+                        $network_id = $network->id;
+                } elseif ( is_numeric( $network ) ) {
+                        $network_id = (int) $network;
+                } else {
+                        return false;
+                }
+
+                $this->populate( $network_id );
+
+                return $this;
+        }
+
+        /**
+         * @since 4.3.0
+         *
+         * @param int $network_id
+         * @return bool
+         */
+        public function populate( $network_id = 0 ) {
+                // Query for network
+                $network = self::get_by_id( $network_id );
+
+                // Bail if no network to update
+                if ( false === $network ) {
+                        return false;
+                }
+
+                // Set the main data
+                $this->set_main_data( $network );
+                $this->set_cookie_domain();
+        }
+
+        /**
+         * Set the network ID, domain, and path
+         *
+         * @since 4.3.0
+         */
+        private function set_main_data( $network ) {
+                $this->id     = $network->id;
+                $this->domain = $network->domain;
+                $this->path   = $network->path;
+        }
+
+        /**
+         * Set the cookie domain, based on the network domain
+         *
+         * @todo What if the domain of the network doesn't match the current site?
+         *
+         * @since WordPress (4.3.0)
+         */
+        private function set_cookie_domain() {
+                $this->cookie_domain = $this->domain;
+                if ( 'www.' === substr( $this->cookie_domain, 0, 4 ) ) {
+                        $this->cookie_domain = substr( $this->cookie_domain, 4 );
+                }
+        }
+
+        /**
+         * Retreive a network from the database by its ID.
+         *
+         * @since 4.3.0
+         *
+         * @param int $network_id
+         *
+         * @return bool|mixed
+         */
+        public static function get_by_id( $network_id = 0 ) {
+                global $wpdb;
+
+                // Check cache
+                $network = wp_cache_get( $network_id, 'networks' );
+
+                // Cache miss
+                if ( false === $network ) {
+
+                        // Query for network data
+                        $network = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->site} WHERE id = %d", $network_id ) );
+
+                        // Bail if network cannot be found
+                        if ( empty( $network ) || is_wp_error( $network ) ) {
+                                $network = false;
+                        }
+
+                        // Add network to cache
+                        wp_cache_add( $network_id, $network, 'networks' );
+                }
+
+                // Return the network
+                return $network;
+        }
+}
+ No newline at end of file

src/wp-includes/ms-load.php

@@ -120 +120 @@
  * @param string   $domain   Domain to check.
  * @param string   $path     Path to check.
  * @param int|null $segments Path segments to use. Defaults to null, or the full path.
- * @return object|bool Network object if successful. False when no network is found.
+ * @return WP_Network|bool Network object if successful. False when no network is found.
  */
 function get_network_by_path( $domain, $path, $segments = null ) {
         global $wpdb;
@@ -264 +264 @@
  * @return object|bool Object containing network information if found, false if not.
  */
 function wp_get_network( $network ) {
-        global $wpdb;
-
-        if ( ! is_object( $network ) ) {
-                $network = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->site WHERE id = %d", $network ) );
-                if ( ! $network ) {
-                        return false;
-                }
-        }
-
+        $network = new WP_Network( $network );
         return $network;
 }
 

src/wp-includes/ms-settings.php

@@ -11 +11 @@
  */
 
 /** Include Multisite initialization functions */
+require_once( ABSPATH . WPINC . '/class-wp-network.php' );
 require_once( ABSPATH . WPINC . '/ms-load.php' );
 require_once( ABSPATH . WPINC . '/ms-default-constants.php' );
 
@@ -21 +22 @@
 /** Check for and define SUBDOMAIN_INSTALL and the deprecated VHOST constant. */
 ms_subdomain_constants();
 
-if ( !isset( $current_site ) || !isset( $current_blog ) ) {
+if ( ! isset( $current_site ) || ! isset( $current_blog ) ) {
 
         // Given the domain and path, let's try to identify the network and site.
         // Usually, it's easier to query the site first, which declares its network.
@@ -44 +45 @@
 
         // If the network is defined in wp-config.php, we can simply use that.
         if ( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) ) {
-                $current_site = new stdClass;
+                $current_site = new WP_Network();
                 $current_site->id = defined( 'SITE_ID_CURRENT_SITE' ) ? SITE_ID_CURRENT_SITE : 1;
                 $current_site->domain = DOMAIN_CURRENT_SITE;
                 $current_site->path = PATH_CURRENT_SITE;
@@ -163 +164 @@
                 exit;
         }
 
-        // @todo What if the domain of the network doesn't match the current site?
-        $current_site->cookie_domain = $current_site->domain;
-        if ( 'www.' === substr( $current_site->cookie_domain, 0, 4 ) ) {
-                $current_site->cookie_domain = substr( $current_site->cookie_domain, 4 );
-        }
-
         // Figure out the current network's main site.
-        if ( ! isset( $current_site->blog_id ) ) {
+        if ( ! isset( $current_site->blog_id ) || 0 === $current_site->blog_id ) {
                 if ( $current_blog->domain === $current_site->domain && $current_blog->path === $current_site->path ) {
                         $current_site->blog_id = $current_blog->blog_id;
                 } elseif ( ! $current_site->blog_id = wp_cache_get( 'network:' . $current_site->id . ':main_site', 'site-options' ) ) {