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

Timestamp:

12/19/2007 05:44:02 PM (18 years ago)

Author:

ryan

Message:

language_attributes() improvements from ionfish. fixes #5393

File:

• trunk/wp-includes/general-template.php (modified) (1 diff)

trunk/wp-includes/general-template.php

@@ -1001 +1001 @@
 }
 
-function language_attributes() {
+function language_attributes($doctype = 'html') {
+    $attributes = array();
     $output = '';
+        
     if ( $dir = get_bloginfo('text_direction') )
-        $output = "dir=\"$dir\"";
+        $attributes[] = "dir=\"$dir\"";
+    
     if ( $lang = get_bloginfo('language') ) {
-        if ( $dir ) $output .= ' ';
-        if ( get_option('html_type') == 'text/html' )
-            $output .= "lang=\"$lang\"";
-        else $output .= "xml:lang=\"$lang\"";
-    }
-
+        if ( get_option('html_type') == 'text/html' || $doctype == 'xhtml' )
+            $attributes[] = "lang=\"$lang\"";
+        
+        if ( get_option('html_type') != 'text/html' || $doctype == 'xhtml' )
+            $attributes[] = "xml:lang=\"$lang\"";
+    }
+    
+    $output = implode(' ', $attributes);
+    $output = apply_filters('language_attributes', $output);
     echo $output;
 }