| Index: trunk/phase3/includes/HTMLFileCache.php |
| — | — | @@ -132,12 +132,12 @@ |
| 133 | 133 | $filename = $this->fileCacheName(); |
| 134 | 134 | // Raw pages should handle cache control on their own, |
| 135 | 135 | // even when using file cache. This reduces hits from clients. |
| 136 | | - if( $this->mType !== 'raw' ) |
| | 136 | + if( $this->mType !== 'raw' ) { |
| 137 | 137 | $wgOut->sendCacheControl(); |
| | 138 | + header( "Content-Type: $wgMimeType; charset={$wgOutputEncoding}" ); |
| | 139 | + header( "Content-Language: $wgContLanguageCode" ); |
| | 140 | + } |
| 138 | 141 | |
| 139 | | - header( "Content-type: $wgMimeType; charset={$wgOutputEncoding}" ); |
| 140 | | - header( "Content-language: $wgContLanguageCode" ); |
| 141 | | - |
| 142 | 142 | if( $this->useGzip() ) { |
| 143 | 143 | if( wfClientAcceptsGzip() ) { |
| 144 | 144 | header( 'Content-Encoding: gzip' ); |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -158,6 +158,8 @@ |
| 159 | 159 | * (bug 17341) "Powered by MediaWiki" should be on the left on RTL wikis |
| 160 | 160 | * (bug 17404) "userrights-interwiki" right was missing in User::$mCoreRights |
| 161 | 161 | * (bug 7509) Separation strings should be configurable |
| | 162 | +* (bug 17420) Send the correct content type from action=raw when the HTML file |
| | 163 | + cache is enabled. |
| 162 | 164 | |
| 163 | 165 | == API changes in 1.15 == |
| 164 | 166 | * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions |