From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 20 Nov 2014 09:25:38 +0000 (-0800)
Subject: Unbreak lock()/unlock() for MemcachedPhpBagOStuff
X-Git-Tag: 1.31.0-rc.0~13231
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=1fa3a4d678fa3f9bac93f8e132aacf460742f18f;p=lhc%2Fweb%2Fwiklou.git

Unbreak lock()/unlock() for MemcachedPhpBagOStuff

Change-Id: I49ce96b65fe6a6e2cba86a990962fe4efc43bbb8
---

diff --git a/includes/objectcache/MemcachedPhpBagOStuff.php b/includes/objectcache/MemcachedPhpBagOStuff.php
index 330d2b52ad..939a7153ab 100644
--- a/includes/objectcache/MemcachedPhpBagOStuff.php
+++ b/includes/objectcache/MemcachedPhpBagOStuff.php
@@ -65,23 +65,6 @@ class MemcachedPhpBagOStuff extends MemcachedBagOStuff {
 		return $this->client->get_multi( array_map( $callback, $keys ) );
 	}
 
-	/**
-	 * @param string $key
-	 * @param int $timeout
-	 * @return bool
-	 */
-	public function lock( $key, $timeout = 0 ) {
-		return $this->client->lock( $this->encodeKey( $key ), $timeout );
-	}
-
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	public function unlock( $key ) {
-		return $this->client->unlock( $this->encodeKey( $key ) );
-	}
-
 	/**
 	 * @param string $key
 	 * @param int $value