Changeset 19797

Timestamp:

01/31/2012 02:30:36 PM (14 years ago)

Author:

nacin

Message:

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.

Location:

trunk

Files:

• wp-includes/locale.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

trunk/wp-includes/locale.php

@@ -188 +188 @@
         $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';
     }
 

trunk/wp-settings.php

@@ -261 +261 @@
 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.