X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FAjaxResponse.php;h=dfcf4677af7329a89434c2281f39757821fe0288;hb=5b6884932adb2c5b4f362b237895b7d8eed9d7c9;hp=3e42c086507bd4becaecf49a20aa2a94a52b8637;hpb=6ff1a938e4f59647872987a491f8cb017636bc5f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/AjaxResponse.php b/includes/AjaxResponse.php
index 3e42c08650..dfcf4677af 100644
--- a/includes/AjaxResponse.php
+++ b/includes/AjaxResponse.php
@@ -186,6 +186,7 @@ class AjaxResponse {
 				# Surrogate-Control controls our CDN, Cache-Control downstream caches
 
 				if ( $this->mConfig->get( 'UseESI' ) ) {
+					wfDeprecated( '$wgUseESI = true', '1.33' );
 					header( 'Surrogate-Control: max-age=' . $this->mCacheDuration . ', content="ESI/1.0"' );
 					header( 'Cache-Control: s-maxage=0, must-revalidate, max-age=0' );
 				} else {
@@ -242,7 +243,7 @@ class AjaxResponse {
 			# this breaks strtotime().
 			$modsince = preg_replace( '/;.*$/', '', $_SERVER["HTTP_IF_MODIFIED_SINCE"] );
 			$modsinceTime = strtotime( $modsince );
-			$ismodsince = wfTimestamp( TS_MW, $modsinceTime ? $modsinceTime : 1 );
+			$ismodsince = wfTimestamp( TS_MW, $modsinceTime ?: 1 );
 			wfDebug( "$fname: -- client send If-Modified-Since: $modsince", 'private' );
 			wfDebug( "$fname: --  we might send Last-Modified : $lastmod", 'private' );