| Index: trunk/phase3/includes/OutputPage.php |
| — | — | @@ -2075,7 +2075,6 @@ |
| 2076 | 2076 | global $wgContLang, $wgUseTrackbacks, $wgStyleVersion, $wgHtml5, $wgWellFormedXml; |
| 2077 | 2077 | global $wgUser, $wgRequest, $wgLang; |
| 2078 | 2078 | |
| 2079 | | - $this->addMeta( "http:Content-Type", "$wgMimeType; charset={$wgOutputEncoding}" ); |
| 2080 | 2079 | if ( $sk->commonPrintStylesheet() ) { |
| 2081 | 2080 | $this->addStyle( 'common/wikiprintable.css', 'print' ); |
| 2082 | 2081 | } |
| — | — | @@ -2117,6 +2116,7 @@ |
| 2118 | 2117 | foreach ( $wgXhtmlNamespaces as $tag => $ns ) { |
| 2119 | 2118 | $htmlAttribs["xmlns:$tag"] = $ns; |
| 2120 | 2119 | } |
| | 2120 | + $this->addMeta( 'http:Content-Type', "$wgMimeType; charset=$wgOutputEncoding" ); |
| 2121 | 2121 | } |
| 2122 | 2122 | $ret .= Html::element( 'html', $htmlAttribs ) . "\n"; |
| 2123 | 2123 | |
| — | — | @@ -2126,6 +2126,13 @@ |
| 2127 | 2127 | $ret .= "$openHead\n"; |
| 2128 | 2128 | } |
| 2129 | 2129 | $ret .= "<title>" . htmlspecialchars( $this->getHTMLTitle() ) . "</title>\n"; |
| | 2130 | + |
| | 2131 | + if ( $wgHtml5 ) { |
| | 2132 | + # More succinct than <meta http-equiv=Content-Type>, has the |
| | 2133 | + # same effect |
| | 2134 | + $ret .= Html::element( 'meta', array( 'charset' => $wgOutputEncoding ) ) . "\n"; |
| | 2135 | + } |
| | 2136 | + |
| 2130 | 2137 | $ret .= implode( "\n", array( |
| 2131 | 2138 | $this->getHeadLinks(), |
| 2132 | 2139 | $this->buildCssLinks(), |