From ea4293b2914d66b726f5931315eada9637a31e3f Mon Sep 17 00:00:00 2001 From: Nikolay Bachiyski Date: Sat, 29 May 2010 20:35:19 +0000 Subject: [PATCH] Better detection whether we are on the Network page. Use custom constant to tell us. See #13565, props nacin We used to load multisite translations each time WP_ALLOW_MULTISITE was defined, but it could lead to alot of false positives. Generic config files can include to allow users to updgrade to multisite without further editing the config file. git-svn-id: https://develop.svn.wordpress.org/trunk@15064 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/network.php | 2 ++ wp-includes/l10n.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/wp-admin/network.php b/wp-admin/network.php index cd277a5cd1..3cf02ce564 100644 --- a/wp-admin/network.php +++ b/wp-admin/network.php @@ -10,6 +10,8 @@ * @subpackage Administration */ +define( 'WP_NETWORK_ADMIN_PAGE', true ); + /** WordPress Administration Bootstrap */ require_once( './admin.php' ); diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php index f5dc9265b3..1ad9499b89 100644 --- a/wp-includes/l10n.php +++ b/wp-includes/l10n.php @@ -367,7 +367,7 @@ function load_default_textdomain() { load_textdomain( 'default', WP_LANG_DIR . "/$locale.mo" ); - if ( is_multisite() || ( defined( 'WP_ALLOW_MULTISITE' ) && WP_ALLOW_MULTISITE ) ) { + if ( is_multisite() || ( defined( 'WP_NETWORK_ADMIN_PAGE' ) && WP_NETWORK_ADMIN_PAGE ) ) { load_textdomain( 'default', WP_LANG_DIR . "/ms-$locale.mo" ); } }