X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FAjaxResponse.php;h=5f889adb863160d261b19a2f438c5083df6a535a;hb=9de4bc9df193f4885cbf9702dc2a9a1a498b0b73;hp=3e42c086507bd4becaecf49a20aa2a94a52b8637;hpb=b12086b6188886cefba2dac518fc7d589a0148c6;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/AjaxResponse.php b/includes/AjaxResponse.php
index 3e42c08650..5f889adb86 100644
--- a/includes/AjaxResponse.php
+++ b/includes/AjaxResponse.php
@@ -162,7 +162,7 @@ class AjaxResponse {
 			// For back-compat, it is supported that mResponseCode be a string like " 200 OK"
 			// (with leading space and the status message after). Cast response code to an integer
 			// to take advantage of PHP's conversion rules which will turn "  200 OK" into 200.
-			// https://secure.php.net/manual/en/language.types.string.php#language.types.string.conversion
+			// https://www.php.net/manual/en/language.types.string.php#language.types.string.conversion
 			$n = intval( trim( $this->mResponseCode ) );
 			HttpStatus::header( $n );
 		}
@@ -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' );
 
@@ -281,7 +282,8 @@ class AjaxResponse {
 			return false;
 		}
 
-		$mcvalue = ObjectCache::getMainWANInstance()->get( $mckey );
+		$cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
+		$mcvalue = $cache->get( $mckey );
 		if ( $mcvalue ) {
 			# Check to see if the value has been invalidated
 			if ( $touched <= $mcvalue['timestamp'] ) {
@@ -303,11 +305,13 @@ class AjaxResponse {
 	 * @return bool
 	 */
 	function storeInMemcached( $mckey, $expiry = 86400 ) {
-		ObjectCache::getMainWANInstance()->set( $mckey,
+		$cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
+		$cache->set( $mckey,
 			[
 				'timestamp' => wfTimestampNow(),
 				'value' => $this->mText
-			], $expiry
+			],
+			$expiry
 		);
 
 		return true;