Changeset 38814 for trunk/src/wp-includes/ms-default-constants.php

Timestamp:

10/19/2016 04:46:14 AM (8 years ago)

Author:

jeremyfelt

Message:

Multisite: Use get_network() and get_current_network_id() for current network data.

get_network() falls back to the current network when called without any arguments. Between this and get_current_network_id(), we can replace almost all instances of the global $current_site and all instances of get_current_site().

This effectively deprecates get_current_site(), something that we'll do in a future ticket.

Props flixos90.
Fixes #37414.

File:

• trunk/src/wp-includes/ms-default-constants.php (modified) (4 diffs)

trunk/src/wp-includes/ms-default-constants.php

@@ -48 +48 @@
  */
 function ms_cookie_constants(  ) {
-    $current_site = get_current_site();
+    $current_network = get_network();
 
     /**
@@ -54 +54 @@
      */
     if ( !defined( 'COOKIEPATH' ) )
-        define( 'COOKIEPATH', $current_site->path );
+        define( 'COOKIEPATH', $current_network->path );
 
     /**
@@ -60 +60 @@
      */
     if ( !defined( 'SITECOOKIEPATH' ) )
-        define( 'SITECOOKIEPATH', $current_site->path );
+        define( 'SITECOOKIEPATH', $current_network->path );
 
     /**
@@ -77 +77 @@
      */
     if ( !defined('COOKIE_DOMAIN') && is_subdomain_install() ) {
-        if ( !empty( $current_site->cookie_domain ) )
-            define('COOKIE_DOMAIN', '.' . $current_site->cookie_domain);
+        if ( !empty( $current_network->cookie_domain ) )
+            define('COOKIE_DOMAIN', '.' . $current_network->cookie_domain);
         else
-            define('COOKIE_DOMAIN', '.' . $current_site->domain);
+            define('COOKIE_DOMAIN', '.' . $current_network->domain);
     }
 }