golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Load locale specific php code in global context. fixes #3488 

git-svn-id: http://svn.automattic.com/wordpress/trunk@4699 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2007-01-08 00:11:06 +00:00
parent d769a35f29
commit 3e26469375
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wp-includes/locale.php
View File

@ -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) {

5
wp-settings.php
View File

@ -242,6 +242,11 @@ define('STYLESHEETPATH', get_stylesheet_directory());
// Load the default text localization domain.
load_default_textdomain();
$locale = get_locale();
$locale_file = ABSPATH . LANGDIR . "/$locale.php";
if ( is_readable($locale_file) )
require_once($locale_file);
// Pull in locale data after loading text domain.
require_once(ABSPATH . WPINC . '/locale.php');