Merge "Restore Content-Language header change from e53ff931a"

diff --git a/includes/cache/HTMLFileCache.php b/includes/cache/HTMLFileCache.php
index a85639f..060837e 100644 (file)
--- a/includes/cache/HTMLFileCache.php
+++ b/includes/cache/HTMLFileCache.php
@@ -167,9 +167,10 @@ class HTMLFileCache extends FileCacheBase {
                        $context->getTitle()->resetArticleID( 0 );
                }
 
+               $contLang = $config->get( 'ContLang' );
                $context->getOutput()->sendCacheControl();
                header( "Content-Type: {$config->get( 'MimeType' )}; charset=UTF-8" );
-               header( "Content-Language: {$config->get( 'LanguageCode' )}" );
+               header( "Content-Language: {$contLang->getHtmlCode()}" );
                if ( $this->useGzip() ) {
                        if ( wfClientAcceptsGzip() ) {
                                header( 'Content-Encoding: gzip' );