Merge "Avoid triggering SiteConfiguration lookup in JobQueueGroup::push()"

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 4c4fb1c..ba14b99 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2268,7 +2268,7 @@ class OutputPage extends ContextSource {
                ob_start();
 
                $response->header( 'Content-type: ' . $config->get( 'MimeType' ) . '; charset=UTF-8' );
-               $response->header( 'Content-language: ' . $config->get( 'LanguageCode' ) );
+               $response->header( 'Content-language: ' . $config->get( 'ContLang' )->getHtmlCode() );
 
                // Avoid Internet Explorer "compatibility view" in IE 8-10, so that
                // jQuery etc. can work correctly.

diff --git a/includes/cache/HTMLFileCache.php b/includes/cache/HTMLFileCache.php
index 52ae279..71011e0 100644 (file)
--- a/includes/cache/HTMLFileCache.php
+++ b/includes/cache/HTMLFileCache.php
@@ -154,7 +154,7 @@ class HTMLFileCache extends FileCacheBase {
         * @return void
         */
        public function loadFromFileCache( IContextSource $context, $mode = self::MODE_NORMAL ) {
-               global $wgMimeType, $wgLanguageCode;
+               global $wgMimeType, $wgContLang;
 
                wfDebug( __METHOD__ . "()\n" );
                $filename = $this->cachePath();
@@ -166,7 +166,7 @@ class HTMLFileCache extends FileCacheBase {
 
                $context->getOutput()->sendCacheControl();
                header( "Content-Type: $wgMimeType; charset=UTF-8" );
-               header( "Content-Language: $wgLanguageCode" );
+               header( 'Content-Language: ' . $wgContLang->getHtmlCode() );
                if ( $this->useGzip() ) {
                        if ( wfClientAcceptsGzip() ) {
                                header( 'Content-Encoding: gzip' );