jenkins-bot has submitted this change and it was merged.

Change subject: Restore Content-Language header change from e53ff931a
......................................................................


Restore Content-Language header change from e53ff931a

This was lost in a rebase at some point.

Change-Id: I46f376a82205a5c99b98c9e971f9e9d7868ce9fb
---
M includes/cache/HTMLFileCache.php
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/cache/HTMLFileCache.php b/includes/cache/HTMLFileCache.php
index a85639f..060837e 100644
--- a/includes/cache/HTMLFileCache.php
+++ b/includes/cache/HTMLFileCache.php
@@ -167,9 +167,10 @@
                        $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' );

-- 
To view, visit https://gerrit.wikimedia.org/r/313630
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I46f376a82205a5c99b98c9e971f9e9d7868ce9fb
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to