X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/6c8f14c09105d0afa4c1574215c59b5021040e76..b22765f41bf0b2021b9beb9120ee0ac91fa89292:/wp-includes/ms-default-constants.php
diff --git a/wp-includes/ms-default-constants.php b/wp-includes/ms-default-constants.php
index 53dfc9b5..98719f8b 100644
--- a/wp-includes/ms-default-constants.php
+++ b/wp-includes/ms-default-constants.php
@@ -14,6 +14,8 @@
* wp-includes/ms-files.php (wp-content/blogs.php in MU).
*
* @since 3.0.0
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
*/
function ms_upload_constants() {
global $wpdb;
@@ -45,7 +47,7 @@ function ms_upload_constants() {
* @since 3.0.0
*/
function ms_cookie_constants( ) {
- global $current_site;
+ $current_site = get_current_site();
/**
* @since 1.2.0
@@ -114,38 +116,49 @@ function ms_file_constants() {
* we will have translations loaded and can trigger warnings easily.
*
* @since 3.0.0
+ *
+ * @staticvar bool $subdomain_error
+ * @staticvar bool $subdomain_error_warn
*/
function ms_subdomain_constants() {
- static $error = null;
- static $error_warn = false;
+ static $subdomain_error = null;
+ static $subdomain_error_warn = null;
- if ( false === $error )
+ if ( false === $subdomain_error ) {
return;
+ }
- if ( $error ) {
- $vhost_deprecated = __( 'The constant VHOST
is deprecated. Use the boolean constant SUBDOMAIN_INSTALL
in wp-config.php to enable a subdomain configuration. Use is_subdomain_install() to check whether a subdomain configuration is enabled.' );
- if ( $error_warn ) {
+ if ( $subdomain_error ) {
+ $vhost_deprecated = sprintf(
+ /* translators: 1: VHOST, 2: SUBDOMAIN_INSTALL, 3: wp-config.php, 4: is_subdomain_install() */
+ __( 'The constant %1$s is deprecated. 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.' ),
+ 'VHOST
',
+ 'SUBDOMAIN_INSTALL
',
+ 'wp-config.php
',
+ 'is_subdomain_install()
'
+ );
+ if ( $subdomain_error_warn ) {
trigger_error( __( 'Conflicting values for the constants VHOST and SUBDOMAIN_INSTALL. 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;
}
if ( defined( 'SUBDOMAIN_INSTALL' ) && defined( 'VHOST' ) ) {
- if ( SUBDOMAIN_INSTALL == ( 'yes' == VHOST ) ) {
- $error = true;
- } else {
- $error = $error_warn = true;
+ $subdomain_error = true;
+ if ( SUBDOMAIN_INSTALL !== ( 'yes' == VHOST ) ) {
+ $subdomain_error_warn = true;
}
} elseif ( defined( 'SUBDOMAIN_INSTALL' ) ) {
+ $subdomain_error = false;
define( 'VHOST', SUBDOMAIN_INSTALL ? 'yes' : 'no' );
} elseif ( defined( 'VHOST' ) ) {
- $error = true;
+ $subdomain_error = true;
define( 'SUBDOMAIN_INSTALL', 'yes' == VHOST );
} else {
+ $subdomain_error = false;
define( 'SUBDOMAIN_INSTALL', false );
define( 'VHOST', 'no' );
}
}
-add_action( 'init', 'ms_subdomain_constants' );