Changeset 14360 for trunk/wp-includes/general-template.php

Timestamp:

05/03/2010 05:49:19 AM (16 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.

File:

• trunk/wp-includes/general-template.php (modified) (4 diffs)

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" );
 }