(bug 17420) Send the correct content type from action=raw when the HTML file cache...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2b34bc8..430bd80 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -158,6 +158,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 17341) "Powered by MediaWiki" should be on the left on RTL wikis
 * (bug 17404) "userrights-interwiki" right was missing in User::$mCoreRights
 * (bug 7509) Separation strings should be configurable
+* (bug 17420) Send the correct content type from action=raw when the HTML file 
+  cache is enabled.
 
 == API changes in 1.15 ==
 * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions

diff --git a/includes/HTMLFileCache.php b/includes/HTMLFileCache.php
index ab3c964..e267962 100644 (file)
--- a/includes/HTMLFileCache.php
+++ b/includes/HTMLFileCache.php
@@ -132,11 +132,11 @@ class HTMLFileCache {
                $filename = $this->fileCacheName();
                // Raw pages should handle cache control on their own,
                // even when using file cache. This reduces hits from clients.
-               if( $this->mType !== 'raw' )
+               if( $this->mType !== 'raw' ) {
                        $wgOut->sendCacheControl();
-
-               header( "Content-type: $wgMimeType; charset={$wgOutputEncoding}" );
-               header( "Content-language: $wgContLanguageCode" );
+                       header( "Content-Type: $wgMimeType; charset={$wgOutputEncoding}" );
+                       header( "Content-Language: $wgContLanguageCode" );
+               }
 
                if( $this->useGzip() ) {
                        if( wfClientAcceptsGzip() ) {