X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FAjaxResponse.php;h=3e42c086507bd4becaecf49a20aa2a94a52b8637;hb=44686573c91c00212702c115c0131ab1f496aae2;hp=34bb65f19bd7cc3305f0681170fccfbc05d49350;hpb=38ba6b620be9f6333d902055ae1c0c610af4985e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/AjaxResponse.php b/includes/AjaxResponse.php
index 34bb65f19b..3e42c08650 100644
--- a/includes/AjaxResponse.php
+++ b/includes/AjaxResponse.php
@@ -20,6 +20,7 @@
  * @file
  * @ingroup Ajax
  */
+use MediaWiki\MediaWikiServices;
 
 /**
  * Handle responses for Ajax requests (send headers, print
@@ -82,7 +83,7 @@ class AjaxResponse {
 	function __construct( $text = null, Config $config = null ) {
 		$this->mCacheDuration = null;
 		$this->mVary = null;
-		$this->mConfig = $config ?: ConfigFactory::getDefaultInstance()->makeConfig( 'main' );
+		$this->mConfig = $config ?: MediaWikiServices::getInstance()->getMainConfig();
 
 		$this->mDisabled = false;
 		$this->mText = '';
@@ -161,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.
-			// http://php.net/string#language.types.string.conversion
+			// https://secure.php.net/manual/en/language.types.string.php#language.types.string.conversion
 			$n = intval( trim( $this->mResponseCode ) );
 			HttpStatus::header( $n );
 		}
@@ -175,14 +176,14 @@ class AjaxResponse {
 		}
 
 		if ( $this->mCacheDuration ) {
-			# If squid caches are configured, tell them to cache the response,
-			# and tell the client to always check with the squid. Otherwise,
+			# If CDN caches are configured, tell them to cache the response,
+			# and tell the client to always check with the CDN. Otherwise,
 			# tell the client to use a cached copy, without a way to purge it.
 
 			if ( $this->mConfig->get( 'UseSquid' ) ) {
 				# Expect explicit purge of the proxy cache, but require end user agents
 				# to revalidate against the proxy on each visit.
-				# Surrogate-Control controls our Squid, Cache-Control downstream caches
+				# Surrogate-Control controls our CDN, Cache-Control downstream caches
 
 				if ( $this->mConfig->get( 'UseESI' ) ) {
 					header( 'Surrogate-Control: max-age=' . $this->mCacheDuration . ', content="ESI/1.0"' );
@@ -223,12 +224,12 @@ class AjaxResponse {
 		$fname = 'AjaxResponse::checkLastModified';
 
 		if ( !$timestamp || $timestamp == '19700101000000' ) {
-			wfDebug( "$fname: CACHE DISABLED, NO TIMESTAMP\n", 'log' );
+			wfDebug( "$fname: CACHE DISABLED, NO TIMESTAMP", 'private' );
 			return false;
 		}
 
 		if ( !$wgCachePages ) {
-			wfDebug( "$fname: CACHE DISABLED\n", 'log' );
+			wfDebug( "$fname: CACHE DISABLED", 'private' );
 			return false;
 		}
 
@@ -242,8 +243,8 @@ class AjaxResponse {
 			$modsince = preg_replace( '/;.*$/', '', $_SERVER["HTTP_IF_MODIFIED_SINCE"] );
 			$modsinceTime = strtotime( $modsince );
 			$ismodsince = wfTimestamp( TS_MW, $modsinceTime ? $modsinceTime : 1 );
-			wfDebug( "$fname: -- client send If-Modified-Since: " . $modsince . "\n", 'log' );
-			wfDebug( "$fname: --  we might send Last-Modified : $lastmod\n", 'log' );
+			wfDebug( "$fname: -- client send If-Modified-Since: $modsince", 'private' );
+			wfDebug( "$fname: --  we might send Last-Modified : $lastmod", 'private' );
 
 			if ( ( $ismodsince >= $timestamp )
 				&& $wgUser->validateCache( $ismodsince ) &&
@@ -255,16 +256,16 @@ class AjaxResponse {
 				$this->mLastModified = $lastmod;
 
 				wfDebug( "$fname: CACHED client: $ismodsince ; user: {$wgUser->getTouched()} ; " .
-					"page: $timestamp ; site $wgCacheEpoch\n", 'log' );
+					"page: $timestamp ; site $wgCacheEpoch", 'private' );
 
 				return true;
 			} else {
 				wfDebug( "$fname: READY  client: $ismodsince ; user: {$wgUser->getTouched()} ; " .
-					"page: $timestamp ; site $wgCacheEpoch\n", 'log' );
+					"page: $timestamp ; site $wgCacheEpoch", 'private' );
 				$this->mLastModified = $lastmod;
 			}
 		} else {
-			wfDebug( "$fname: client did not send If-Modified-Since header\n", 'log' );
+			wfDebug( "$fname: client did not send If-Modified-Since header", 'private' );
 			$this->mLastModified = $lastmod;
 		}
 		return false;
@@ -284,12 +285,12 @@ class AjaxResponse {
 		if ( $mcvalue ) {
 			# Check to see if the value has been invalidated
 			if ( $touched <= $mcvalue['timestamp'] ) {
-				wfDebug( "Got $mckey from cache\n" );
+				wfDebug( "Got $mckey from cache" );
 				$this->mText = $mcvalue['value'];
 
 				return true;
 			} else {
-				wfDebug( "$mckey has expired\n" );
+				wfDebug( "$mckey has expired" );
 			}
 		}
 
@@ -303,10 +304,10 @@ class AjaxResponse {
 	 */
 	function storeInMemcached( $mckey, $expiry = 86400 ) {
 		ObjectCache::getMainWANInstance()->set( $mckey,
-			array(
+			[
 				'timestamp' => wfTimestampNow(),
 				'value' => $this->mText
-			), $expiry
+			], $expiry
 		);
 
 		return true;