WordPress 4.7

[autoinstalls/wordpress.git] / wp-includes / ms-default-constants.php

diff --git a/wp-includes/ms-default-constants.php b/wp-includes/ms-default-constants.php
index dd17201e4c8ef1b9b8a5f04e9fbb8a16be692b1c..5a54b88dc30d91e796be94f03c7cd5eae7879213 100644 (file)
--- a/wp-includes/ms-default-constants.php
+++ b/wp-includes/ms-default-constants.php
@@ -47,19 +47,19 @@ function ms_upload_constants() {
  * @since 3.0.0
  */
 function ms_cookie_constants(  ) {
-       $current_site = get_current_site();
+       $current_network = get_network();
 
        /**
         * @since 1.2.0
         */
        if ( !defined( 'COOKIEPATH' ) )
-               define( 'COOKIEPATH', $current_site->path );
+               define( 'COOKIEPATH', $current_network->path );
 
        /**
         * @since 1.5.0
         */
        if ( !defined( 'SITECOOKIEPATH' ) )
-               define( 'SITECOOKIEPATH', $current_site->path );
+               define( 'SITECOOKIEPATH', $current_network->path );
 
        /**
         * @since 2.6.0
@@ -76,10 +76,10 @@ function ms_cookie_constants(  ) {
         * @since 2.0.0
         */
        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);
        }
 }
 
@@ -140,7 +140,7 @@ function ms_subdomain_constants() {
                if ( $subdomain_error_warn ) {
                        trigger_error( __( '<strong>Conflicting values for the constants VHOST and SUBDOMAIN_INSTALL.</strong> The value of SUBDOMAIN_INSTALL will be assumed to be your subdomain configuration setting.' ) . ' ' . $vhost_deprecated, E_USER_WARNING );
                } else {
-                       _deprecated_argument( 'define()', '3.0', $vhost_deprecated );
+                       _deprecated_argument( 'define()', '3.0.0', $vhost_deprecated );
                }
                return;
        }