Integrate mu_locale() into get_locale(). see #11644

git-svn-id: https://develop.svn.wordpress.org/trunk@12900 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2010-01-29 19:03:51 +00:00
parent c180f69c52
commit 954968abef
3 changed files with 10 additions and 15 deletions
-12
View File
@@ -1752,18 +1752,6 @@ function wordpressmu_wp_mail_from( $email ) {
return $email;
}
function mu_locale( $locale ) {
if ( defined('WP_INSTALLING') == false ) {
$mu_locale = get_option('WPLANG');
if ( $mu_locale === false )
$mu_locale = get_site_option('WPLANG');
if ( $mu_locale !== false )
return $mu_locale;
}
return $locale;
}
function signup_nonce_fields() {
$id = mt_rand();
echo "<input type='hidden' name='signup_form_id' value='{$id}' />";