X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2FAjaxResponse.php;h=34bb65f19bd7cc3305f0681170fccfbc05d49350;hb=1d489846c1691d2ba93220e09891c990543dabb1;hp=2984c33a56b411835b235b07bc770199b642322a;hpb=00050cbb4d4d6d0b168a4ee2073e305149ad612d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/AjaxResponse.php b/includes/AjaxResponse.php
index 2984c33a56..34bb65f19b 100644
--- a/includes/AjaxResponse.php
+++ b/includes/AjaxResponse.php
@@ -166,12 +166,12 @@ class AjaxResponse {
 			HttpStatus::header( $n );
 		}
 
-		header ( "Content-Type: " . $this->mContentType );
+		header( "Content-Type: " . $this->mContentType );
 
 		if ( $this->mLastModified ) {
-			header ( "Last-Modified: " . $this->mLastModified );
+			header( "Last-Modified: " . $this->mLastModified );
 		} else {
-			header ( "Last-Modified: " . gmdate( "D, d M Y H:i:s" ) . " GMT" );
+			header( "Last-Modified: " . gmdate( "D, d M Y H:i:s" ) . " GMT" );
 		}
 
 		if ( $this->mCacheDuration ) {
@@ -193,20 +193,20 @@ class AjaxResponse {
 
 			} else {
 				# Let the client do the caching. Cache is not purged.
-				header ( "Expires: " . gmdate( "D, d M Y H:i:s", time() + $this->mCacheDuration ) . " GMT" );
-				header ( "Cache-Control: s-maxage={$this->mCacheDuration}," .
+				header( "Expires: " . gmdate( "D, d M Y H:i:s", time() + $this->mCacheDuration ) . " GMT" );
+				header( "Cache-Control: s-maxage={$this->mCacheDuration}," .
 					"public,max-age={$this->mCacheDuration}" );
 			}
 
 		} else {
 			# always expired, always modified
-			header ( "Expires: Mon, 26 Jul 1997 05:00:00 GMT" );    // Date in the past
-			header ( "Cache-Control: no-cache, must-revalidate" );  // HTTP/1.1
-			header ( "Pragma: no-cache" );                          // HTTP/1.0
+			header( "Expires: Mon, 26 Jul 1997 05:00:00 GMT" );    // Date in the past
+			header( "Cache-Control: no-cache, must-revalidate" );  // HTTP/1.1
+			header( "Pragma: no-cache" );                          // HTTP/1.0
 		}
 
 		if ( $this->mVary ) {
-			header ( "Vary: " . $this->mVary );
+			header( "Vary: " . $this->mVary );
 		}
 	}
 
@@ -276,13 +276,11 @@ class AjaxResponse {
 	 * @return bool
 	 */
 	function loadFromMemcached( $mckey, $touched ) {
-		global $wgMemc;
-
 		if ( !$touched ) {
 			return false;
 		}
 
-		$mcvalue = $wgMemc->get( $mckey );
+		$mcvalue = ObjectCache::getMainWANInstance()->get( $mckey );
 		if ( $mcvalue ) {
 			# Check to see if the value has been invalidated
 			if ( $touched <= $mcvalue['timestamp'] ) {
@@ -304,9 +302,7 @@ class AjaxResponse {
 	 * @return bool
 	 */
 	function storeInMemcached( $mckey, $expiry = 86400 ) {
-		global $wgMemc;
-
-		$wgMemc->set( $mckey,
+		ObjectCache::getMainWANInstance()->set( $mckey,
 			array(
 				'timestamp' => wfTimestampNow(),
 				'value' => $this->mText