From: Aryeh Gregor Date: Wed, 15 Jul 2009 22:55:30 +0000 (+0000) Subject: Remove some XML cruft from HTML 5 X-Git-Tag: 1.31.0-rc.0~40904 X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=49107f11c0522724bacabed9878ff515edadf442;p=lhc%2Fweb%2Fwiklou.git Remove some XML cruft from HTML 5 --- diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 40b86e587b..e317827bf5 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -1737,22 +1737,24 @@ class OutputPage { $ret .= "\n"; } - if ( $wgHtml5 ) { - $ret .= "\n"; - } else { - $ret .= "\n"; - } - if ( '' == $this->getHTMLTitle() ) { $this->setHTMLTitle( wfMsg( 'pagetitle', $this->getPageTitle() )); } $dir = $wgContLang->isRTL() ? 'rtl' : 'ltr'; - $ret .= " $ns) { - $ret .= "xmlns:{$tag}=\"{$ns}\" "; + + if ( $wgHtml5 ) { + $ret .= "\n"; + $ret .= "\n"; + } else { + $ret .= "\n"; + $ret .= " $ns) { + $ret .= "xmlns:{$tag}=\"{$ns}\" "; + } + $ret .= "xml:lang=\"$wgContLanguageCode\" lang=\"$wgContLanguageCode\" dir=\"$dir\">\n"; } - $ret .= "xml:lang=\"$wgContLanguageCode\" lang=\"$wgContLanguageCode\" dir=\"$dir\">\n"; + $ret .= "\n\t" . htmlspecialchars( $this->getHTMLTitle() ) . "\n\t"; $ret .= implode( "\n", array( $this->getHeadLinks(),