dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5cb82b4)
Remove some XML cruft from HTML 5
authorAryeh Gregor <simetrical@users.mediawiki.org>
Wed, 15 Jul 2009 22:55:30 +0000 (22:55 +0000)
committerAryeh Gregor <simetrical@users.mediawiki.org>
Wed, 15 Jul 2009 22:55:30 +0000 (22:55 +0000)
includes/OutputPage.php patch | blob | history

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 40b86e5..e317827 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1737,22 +1737,24 @@ class OutputPage {
                        $ret .= "<?xml version=\"1.0\" encoding=\"$wgOutputEncoding\" ?" . ">\n";
                }
 
-               if ( $wgHtml5 ) {
-                       $ret .= "<!doctype html>\n";
-               } else {
-                       $ret .= "<!DOCTYPE html PUBLIC \"$wgDocType\" \"$wgDTD\">\n";
-               }
-
                if ( '' == $this->getHTMLTitle() ) {
                        $this->setHTMLTitle(  wfMsg( 'pagetitle', $this->getPageTitle() ));
                }
 
                $dir = $wgContLang->isRTL() ? 'rtl' : 'ltr';
-               $ret .= "<html xmlns=\"{$wgXhtmlDefaultNamespace}\" ";
-               foreach($wgXhtmlNamespaces as $tag => $ns) {
-                       $ret .= "xmlns:{$tag}=\"{$ns}\" ";
+
+               if ( $wgHtml5 ) {
+                       $ret .= "<!doctype html>\n";
+                       $ret .= "<html lang=\"$wgContLanguageCode\" dir=\"$dir\">\n";
+               } else {
+                       $ret .= "<!DOCTYPE html PUBLIC \"$wgDocType\" \"$wgDTD\">\n";
+                       $ret .= "<html xmlns=\"{$wgXhtmlDefaultNamespace}\" ";
+                       foreach($wgXhtmlNamespaces as $tag => $ns) {
+                               $ret .= "xmlns:{$tag}=\"{$ns}\" ";
+                       }
+                       $ret .= "xml:lang=\"$wgContLanguageCode\" lang=\"$wgContLanguageCode\" dir=\"$dir\">\n";
                }
-               $ret .= "xml:lang=\"$wgContLanguageCode\" lang=\"$wgContLanguageCode\" dir=\"$dir\">\n";
+
                $ret .= "<head>\n\t<title>" . htmlspecialchars( $this->getHTMLTitle() ) . "</title>\n\t";
                $ret .= implode( "\n", array(
                        $this->getHeadLinks(),
Wiklou, le Wiki du Wiklou