Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Only set text_direction based on a locale being RTL if we successfully loaded a locale.mo file. Otherwise we may be in RTL land based on a WPLANG constant but nothing else. fixes #19924. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@19797 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2012-01-31 14:30:36 +00:00
parent 2aec12b287
commit ecedc9152f
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/locale.php
View File

@ -187,13 +187,11 @@ class WP_Locale {
$trans = __('number_format_decimal_point');
$this->number_format['decimal_point'] = ('number_format_decimal_point' == $trans) ? '.' : $trans;
// Locale-specific tweaks
if ( self::is_locale_rtl( get_locale() ) )
$this->text_direction = 'rtl';
// Import the $text_direction global.
// Set text direction.
if ( isset( $GLOBALS['text_direction'] ) )
$this->text_direction = $GLOBALS['text_direction'];
elseif ( is_textdomain_loaded( 'default' ) && self::is_locale_rtl( get_locale() ) )
$this->text_direction = 'rtl';
}
/**

5
wp-settings.php
View File

@ -260,12 +260,11 @@ wp_templating_constants( );
// Load the default text localization domain.
load_default_textdomain();
// Find the blog locale.
$locale = get_locale();
$locale_file = WP_LANG_DIR . "/$locale.php";
if ( ( 0 === validate_file( $locale ) ) && is_readable( $locale_file ) )
if ( ( 0 === validate_file( $locale_file ) ) && is_readable( $locale_file ) )
require( $locale_file );
unset($locale_file);
unset( $locale_file );
// Pull in locale data after loading text domain.
require_once( ABSPATH . WPINC . '/locale.php' );