Fix validity error caused by r66068
authorAryeh Gregor <simetrical@users.mediawiki.org>
Wed, 12 May 2010 18:25:50 +0000 (18:25 +0000)
committerAryeh Gregor <simetrical@users.mediawiki.org>
Wed, 12 May 2010 18:25:50 +0000 (18:25 +0000)
The code to output <meta charset=UTF-8> in HTML5 mode was moved above
the code to output <head>, so you got <meta> before <head>.  Reported by
Roan Kattouw on IRC.  Only affected $wgWellFormedXml = true (the
default), because non-well-formed mode just omits <head> entirely.  :)

includes/OutputPage.php

index d5e71f8..4673306 100644 (file)
@@ -2100,6 +2100,12 @@ class OutputPage {
                        $this->setHTMLTitle( wfMsg( 'pagetitle', $this->getPageTitle() ) );
                }
 
+               $openHead = Html::openElement( 'head' );
+               if ( $openHead ) {
+                       # Don't bother with the newline if $head == ''
+                       $ret .= "$openHead\n";
+               }
+
                if ( $wgHtml5 ) {
                        # More succinct than <meta http-equiv=Content-Type>, has the
                        # same effect
@@ -2108,14 +2114,8 @@ class OutputPage {
                        $this->addMeta( 'http:Content-Type', "$wgMimeType; charset=$wgOutputEncoding" );
                }
 
-               $openHead = Html::openElement( 'head' );
-               if ( $openHead ) {
-                       # Don't bother with the newline if $head == ''
-                       $ret .= "$openHead\n";
-               }
                $ret .= Html::element( 'title', null, $this->getHTMLTitle() ) . "\n";
 
-
                $ret .= implode( "\n", array(
                        $this->getHeadLinks(),
                        $this->buildCssLinks(),