X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FCacheManager.php;h=ebcc7a9830eb152b0769c6fdc173956a2298f75f;hb=b03fbbff778eb0563de5c1bd14cc517a5d2e8a07;hp=ab6c66d5e442f0b2a05cac7730f3a1dec50a7131;hpb=f84493db51656cee37c2d9f4f06ce80313198017;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/CacheManager.php b/includes/CacheManager.php
index ab6c66d5e4..ebcc7a9830 100644
--- a/includes/CacheManager.php
+++ b/includes/CacheManager.php
@@ -55,7 +55,7 @@ class CacheManager {
 	}
 	
 	function fileCacheTime() {
-		return wfUnix2Timestamp( filemtime( $this->fileCacheName() ) );
+		return wfTimestamp( TS_MW, filemtime( $this->fileCacheName() ) );
 	}
 	
 	function isFileCacheGood( $timestamp ) {
@@ -92,11 +92,14 @@ class CacheManager {
 	
 	/* Working directory to/from output */
 	function loadFromFileCache() {
-		global $wgOut;
+		global $wgOut, $wgMimeType, $wgOutputEncoding, $wgContLanguageCode;
 		wfDebug(" loadFromFileCache()\n");
 		
 		$filename=$this->fileCacheName();
 		$wgOut->sendCacheControl();
+
+		header( "Content-type: $wgMimeType; charset={$wgOutputEncoding}" );
+		header( "Content-language: $wgContLanguageCode" );
 		
 		if( $this->useGzip() ) {
 			if( wfClientAcceptsGzip() ) {