WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues 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. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19754 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2012-01-25 22:29:33 +00:00
parent 8361ce4be1
commit c06c813b46
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'; 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. * Sets up the translated strings and object properties.
* *
@ -186,11 +177,9 @@ class WP_Locale {
$trans = __('number_format_decimal_point'); $trans = __('number_format_decimal_point');
$this->number_format['decimal_point'] = ('number_format_decimal_point' == $trans) ? '.' : $trans; $this->number_format['decimal_point'] = ('number_format_decimal_point' == $trans) ? '.' : $trans;
// Import global locale vars set during inclusion of $locale.php. // Import the $text_direction global.
foreach ( (array) $this->locale_vars as $var ) { if ( isset( $GLOBALS['text_direction'] ) )
if ( isset($GLOBALS[$var]) ) $this->text_direction = $GLOBALS['text_direction'];
$this->$var = $GLOBALS[$var];
}
} }