diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-08 18:25:37 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-08 18:25:37 +0000 |
| commit | bb3e16e9745abc5d625a8254303c3875c7a04ebf (patch) | |
| tree | 105f7abc052be575a643971ab59b3b38f4fa7056 /wp-includes/locale.php | |
| parent | 11571c1befd735bd1d69caea2b093164215b4fee (diff) | |
| download | wordpress-mu-bb3e16e9745abc5d625a8254303c3875c7a04ebf.tar.gz wordpress-mu-bb3e16e9745abc5d625a8254303c3875c7a04ebf.tar.xz wordpress-mu-bb3e16e9745abc5d625a8254303c3875c7a04ebf.zip | |
WP Merge to 4701
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@832 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/locale.php')
| -rw-r--r-- | wp-includes/locale.php | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/wp-includes/locale.php b/wp-includes/locale.php index 4b6c654..11903fc 100644 --- a/wp-includes/locale.php +++ b/wp-includes/locale.php @@ -87,20 +87,12 @@ class WP_Locale { $this->meridiem['AM'] = __('AM'); $this->meridiem['PM'] = __('PM'); - $this->_load_locale_data(); - } - - function _load_locale_data() { - $locale = get_locale(); - $locale_file = ABSPATH . "wp-includes/languages/$locale.php"; - if ( !file_exists($locale_file) ) - return; - - include($locale_file); - + // Import global locale vars set during inclusion of $locale.php. foreach ( $this->locale_vars as $var ) { - $this->$var = $$var; + if ( isset($GLOBALS[$var]) ) + $this->$var = $GLOBALS[$var]; } + } function get_weekday($weekday_number) { |