Changeset 12900
- Timestamp:
- 01/29/2010 07:03:51 PM (15 years ago)
- Location:
- trunk/wp-includes
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-includes/l10n.php
r12840 r12900 35 35 if ( defined( 'WPLANG' ) ) 36 36 $locale = WPLANG; 37 38 // If multisite, check options. 39 if ( is_multisite() && !defined('WP_INSTALLING') ) { 40 $ms_locale = get_option('WPLANG'); 41 if ( $ms_locale === false ) 42 $ms_locale = get_site_option('WPLANG'); 43 44 if ( $ms_locale !== false ) 45 $locale = $ms_locale; 46 } 37 47 38 48 if ( empty( $locale ) ) -
trunk/wp-includes/ms-default-filters.php
r12879 r12900 14 14 // Register Nonce 15 15 add_action ( 'signup_hidden_fields', 'signup_nonce_fields' ); 16 17 // Locale18 add_filter ( 'locale', 'mu_locale' );19 16 20 17 // Template -
trunk/wp-includes/ms-functions.php
r12880 r12900 1753 1753 } 1754 1754 1755 function mu_locale( $locale ) {1756 if ( defined('WP_INSTALLING') == false ) {1757 $mu_locale = get_option('WPLANG');1758 if ( $mu_locale === false )1759 $mu_locale = get_site_option('WPLANG');1760 1761 if ( $mu_locale !== false )1762 return $mu_locale;1763 }1764 return $locale;1765 }1766 1767 1755 function signup_nonce_fields() { 1768 1756 $id = mt_rand();
Note: See TracChangeset
for help on using the changeset viewer.