* 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;
* @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
* @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);
}
}
* 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 $subdomain_error = null;
}
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;
}
define( 'VHOST', 'no' );
}
}
-add_action( 'init', 'ms_subdomain_constants' );