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 05b1eeb2d01a341c86b4d06e0403f2c97a2c2942..5a54b88dc30d91e796be94f03c7cd5eae7879213 100644 (file)
--- a/wp-includes/ms-default-constants.php
+++ b/wp-includes/ms-default-constants.php
@@ -15,7 +15,7 @@
  *
  * @since 3.0.0
  *
- * @global wpdb $wpdb
+ * @global wpdb $wpdb WordPress database abstraction object.
  */
 function ms_upload_constants() {
        global $wpdb;
@@ -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);
        }
 }
 
@@ -129,11 +129,18 @@ function ms_subdomain_constants() {
        }
 
        if ( $subdomain_error ) {
-               $vhost_deprecated = __( 'The constant <code>VHOST</code> <strong>is deprecated</strong>. Use the boolean constant <code>SUBDOMAIN_INSTALL</code> in wp-config.php to enable a subdomain configuration. Use is_subdomain_install() to check whether a subdomain configuration is enabled.' );
+               $vhost_deprecated = sprintf(
+                       /* translators: 1: VHOST, 2: SUBDOMAIN_INSTALL, 3: wp-config.php, 4: is_subdomain_install() */
+                       __( 'The constant %1$s <strong>is deprecated</strong>. Use the boolean constant %2$s in %3$s to enable a subdomain configuration. Use %4$s to check whether a subdomain configuration is enabled.' ),
+                       '<code>VHOST</code>',
+                       '<code>SUBDOMAIN_INSTALL</code>',
+                       '<code>wp-config.php</code>',
+                       '<code>is_subdomain_install()</code>'
+               );
                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;
        }