Changeset 14360

Timestamp:

05/03/2010 05:49:19 AM (14 years ago)

Author:

nacin

Message:

Introduce is_rtl(). Use it in core. It only becomes defined when locale is loaded, so it's impossible to use it too early. Deprecate the get_bloginfo('text_direction') call. fixes #13206.

Location:

trunk

Files:

• wp-content/plugins/hello.php (modified) (1 diff)
• wp-includes/functions.php (modified) (3 diffs)
• wp-includes/general-template.php (modified) (4 diffs)
• wp-includes/js/tinymce/wp-mce-help.php (modified) (1 diff)
• wp-includes/locale.php (modified) (1 diff)
• wp-includes/media.php (modified) (1 diff)
• wp-includes/post-template.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)
• wp-includes/theme.php (modified) (1 diff)

trunk/wp-content/plugins/hello.php

@@ -63 +63 @@
 function dolly_css() {
     // This makes sure that the posinioning is also good for right-to-left languages
-    $x = ( 'rtl' == get_bloginfo( 'text_direction' ) ) ? 'left' : 'right';
+    $x = ( is_rtl() ) ? 'left' : 'right';
 
     echo "

trunk/wp-includes/functions.php

@@ -2606 +2606 @@
  */
 function _default_wp_die_handler( $message, $title = '', $args = array() ) {
-    global $wp_locale;
-
     $defaults = array( 'response' => 500 );
     $r = wp_parse_args($args, $defaults);
@@ -2662 +2660 @@
     if ( isset($r['text_direction']) && 'rtl' == $r['text_direction'] )
         $text_direction = 'rtl';
-    elseif ( isset($wp_locale ) && 'rtl' == $wp_locale->text_direction )
+    elseif ( function_exists( 'is_rtl' ) && is_rtl() )
         $text_direction = 'rtl';
 ?>
@@ -2744 +2742 @@
  */
 function _mce_set_direction( $input ) {
-    global $wp_locale;
-
-    if ( 'rtl' == $wp_locale->text_direction ) {
+    if ( is_rtl() ) {
         $input['directionality'] = 'rtl';
         $input['plugins'] .= ',directionality';

trunk/wp-includes/general-template.php

@@ -399 +399 @@
         case 'home' : // DEPRECATED
         case 'siteurl' : // DEPRECATED
-            _deprecated_argument( __FUNCTION__, '2.2', sprintf( __('The <code>%1$s</code> option is deprecated for the family of <code>bloginfo()</code> functions. Use the <code>%2$s</code> option instead.'), $show, 'url' ) );
+            _deprecated_argument( __FUNCTION__, '2.2', sprintf( __('The <code>%s</code> option is deprecated for the family of <code>bloginfo()</code> functions.' ), $show ) . ' ' . sprintf( __( 'Use the <code>%s</code> option instead.' ), 'url'  ) );
         case 'url' :
             $output = home_url();
@@ -459 +459 @@
             break;
         case 'text_direction':
-            global $wp_locale;
-            if ( isset( $wp_locale ) )
-                $output = $wp_locale->text_direction;
-            else
-                $output = 'ltr';
+            //_deprecated_argument( __FUNCTION__, '2.2', sprintf( __('The <code>%s</code> option is deprecated for the family of <code>bloginfo()</code> functions.' ), $show ) . ' ' . sprintf( __( 'Use the <code>%s</code> function instead.' ), 'is_rtl()'  ) );
+            return function_exists( 'is_rtl' ) ? is_rtl() : 'ltr';
             break;
         case 'name':
@@ -1875 +1872 @@
     $output = '';
 
-    if ( $dir = get_bloginfo('text_direction') )
-        $attributes[] = "dir=\"$dir\"";
+    if ( function_exists( 'is_rtl' ) )
+        $attributes[] = 'dir="' . ( is_rtl() ? 'rtl' : 'ltr' ) . '"';
 
     if ( $lang = get_bloginfo('language') ) {
@@ -2113 +2110 @@
 
     echo apply_filters( 'wp_admin_css', "<link rel='stylesheet' href='" . wp_admin_css_uri( $file ) . "' type='text/css' />\n", $file );
-    if ( 'rtl' == get_bloginfo( 'text_direction' ) )
+    if ( is_rtl() )
         echo apply_filters( 'wp_admin_css', "<link rel='stylesheet' href='" . wp_admin_css_uri( "$file-rtl" ) . "' type='text/css' />\n", "$file-rtl" );
 }

trunk/wp-includes/js/tinymce/wp-mce-help.php

@@ -129 +129 @@
     }
 </style>
-<?php if ( ('rtl' == $wp_locale->text_direction) ) : ?>
+<?php if ( is_rtl() ) : ?>
 <style type="text/css">
     #wphead, #tabs {

trunk/wp-includes/locale.php

@@ -327 +327 @@
         $this->register_globals();
     }
+    /**
+     * Checks if current locale is RTL.
+     *
+     * @since 3.0.0
+     * @return bool Whether locale is RTL.
+     */
+     function is_rtl() {
+        return 'rtl' == $this->text_direction;
+     }
 }
 
+/**
+ * Checks if current locale is RTL.
+ *
+ * @since 3.0.0
+ * @return bool Whether locale is RTL.
+ */
+function is_rtl() {
+    global $wp_locale;
+    return $wp_locale->is_rtl();
+}
+
 ?>

trunk/wp-includes/media.php

@@ -782 +782 @@
     $columns = intval($columns);
     $itemwidth = $columns > 0 ? floor(100/$columns) : 100;
-    $float = $wp_locale->text_direction == 'rtl' ? 'right' : 'left';
+    $float = is_rtl() ? 'right' : 'left';
 
     $selector = "gallery-{$instance}";

trunk/wp-includes/post-template.php

@@ -373 +373 @@
     $classes = array();
 
-    if ( 'rtl' == get_bloginfo( 'text_direction' ) )
+    if ( is_rtl() )
         $classes[] = 'rtl';
 

trunk/wp-includes/script-loader.php

@@ -434 +434 @@
     $styles->content_url = defined('WP_CONTENT_URL')? WP_CONTENT_URL : '';
     $styles->default_version = get_bloginfo( 'version' );
-    $styles->text_direction = 'rtl' == get_bloginfo( 'text_direction' ) ? 'rtl' : 'ltr';
+    $styles->text_direction = function_exists( 'is_rtl' ) && is_rtl() ? 'rtl' : 'ltr';
     $styles->default_dirs = array('/wp-admin/');
 

trunk/wp-includes/theme.php

@@ -1581 +1581 @@
     $editor_styles = (array) $editor_styles;
     $stylesheet    = (array) $stylesheet;
-    if ('rtl' == get_bloginfo('text_direction') ) {
+    if ( is_rtl() ) {
         $rtl_stylesheet = str_replace('.css', '-rtl.css', $stylesheet[0]);
         $stylesheet[] = $rtl_stylesheet;