From ad5f0e1b02e78dd59817e90c4228181f69a339c8 Mon Sep 17 00:00:00 2001 From: nbachiyski Date: Sat, 29 May 2010 15:32:43 +0000 Subject: [PATCH] Load multisite strings POT file only on multisite requests. Fixes #13565 git-svn-id: http://svn.automattic.com/wordpress/trunk@15053 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/l10n.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php index 6f2a9aa9a..f5dc9265b 100644 --- a/wp-includes/l10n.php +++ b/wp-includes/l10n.php @@ -365,9 +365,11 @@ function unload_textdomain( $domain ) { function load_default_textdomain() { $locale = get_locale(); - $mofile = WP_LANG_DIR . "/$locale.mo"; - - return load_textdomain( 'default', $mofile ); + load_textdomain( 'default', WP_LANG_DIR . "/$locale.mo" ); + + if ( is_multisite() || ( defined( 'WP_ALLOW_MULTISITE' ) && WP_ALLOW_MULTISITE ) ) { + load_textdomain( 'default', WP_LANG_DIR . "/ms-$locale.mo" ); + } } /**