Changeset 15064

Timestamp:

05/29/2010 08:35:19 PM (15 years ago)

Author:

nbachiyski

Message:

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.

Location:

trunk

Files:

• wp-admin/network.php (modified) (1 diff)
• wp-includes/l10n.php (modified) (1 diff)

trunk/wp-admin/network.php

@@ -10 +10 @@
  * @subpackage Administration
  */
+
+define( 'WP_NETWORK_ADMIN_PAGE', true );
 
 /** WordPress Administration Bootstrap */

trunk/wp-includes/l10n.php

@@ -368 +368 @@
     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" );
     }