mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-02-26 09:33:46 +01:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Remove locale_vars from WP_Locale. Explicitly set the text_direction property from a global, not from an arbitrary list. see #19600.

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@19754 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin 2012-01-25 22:29:33 +00:00
parent 0ac5563ac8
commit eb56e50088
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wp-includes/locale.php
View File

@ -84,15 +84,6 @@ class WP_Locale {
*/
var $text_direction = 'ltr';
/**
* Imports the global version to the class property.
*
* @since 2.1.0
* @var array
* @access private
*/
var $locale_vars = array('text_direction');
/**
* Sets up the translated strings and object properties.
*
@ -186,11 +177,9 @@ class WP_Locale {
$trans = __('number_format_decimal_point');
$this->number_format['decimal_point'] = ('number_format_decimal_point' == $trans) ? '.' : $trans;
// Import global locale vars set during inclusion of $locale.php.
foreach ( (array) $this->locale_vars as $var ) {
if ( isset($GLOBALS[$var]) )
$this->$var = $GLOBALS[$var];
}
// Import the $text_direction global.
if ( isset( $GLOBALS['text_direction'] ) )
$this->text_direction = $GLOBALS['text_direction'];
}