From: Domas Mituzas <midom@users.mediawiki.org>
Date: Mon, 6 Sep 2004 10:10:49 +0000 (+0000)
Subject: lastmodified timestamps
X-Git-Tag: 1.5.0alpha1~2082
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=29af0f3625c69a50b6aa882f978a7e06c73e4794;p=lhc%2Fweb%2Fwiklou.git

lastmodified timestamps
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index b0185565df..777039a881 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -87,6 +87,7 @@ class OutputPage {
 	function checkLastModified ( $timestamp )
 	{
 		global $wgLang, $wgCachePages, $wgUser;
+		$timestamp=wfTimestamp(TS_MW,$timestamp);
 		if( !$wgCachePages ) {
 			wfDebug( "CACHE DISABLED\n", false );
 			return;
@@ -101,17 +102,16 @@ class OutputPage {
 			return;
 		}
 
-		$lastmod = gmdate( "D, j M Y H:i:s", wfTimestamp2Unix( max( $timestamp, $wgUser->mTouched ) ) ) . " GMT";
+		$lastmod = gmdate( "D, j M Y H:i:s", wfTimestamp(TS_UNIX, max( $timestamp, $wgUser->mTouched ) ) ) . " GMT";
 
 		if( !empty( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) {
 			# IE sends sizes after the date like this:
 			# Wed, 20 Aug 2003 06:51:19 GMT; length=5202
 			# this breaks strtotime().
 			$modsince = preg_replace( '/;.*$/', '', $_SERVER["HTTP_IF_MODIFIED_SINCE"] );
-			$ismodsince = wfUnix2Timestamp( strtotime( $modsince ) );
+			$ismodsince = wfTimestamp( TS_MW, strtotime( $modsince ) );
 			wfDebug( "-- client send If-Modified-Since: " . $modsince . "\n", false );
 			wfDebug( "--  we might send Last-Modified : $lastmod\n", false );
-
 			if( ($ismodsince >= $timestamp ) and $wgUser->validateCache( $ismodsince ) ) {
 				# Make sure you're in a place you can leave when you call us!
 				header( "HTTP/1.0 304 Not Modified" );