From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 4 Jun 2015 07:31:04 +0200 Subject: Update to MediaWiki 1.25.1 --- includes/objectcache/MemcachedPhpBagOStuff.php | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'includes/objectcache/MemcachedPhpBagOStuff.php') diff --git a/includes/objectcache/MemcachedPhpBagOStuff.php b/includes/objectcache/MemcachedPhpBagOStuff.php index 330d2b52..6fba61ba 100644 --- a/includes/objectcache/MemcachedPhpBagOStuff.php +++ b/includes/objectcache/MemcachedPhpBagOStuff.php @@ -42,6 +42,7 @@ class MemcachedPhpBagOStuff extends MemcachedBagOStuff { * @param array $params */ function __construct( $params ) { + parent::__construct( $params ); $params = $this->applyDefaultParams( $params ); $this->client = new MemCachedClientforWiki( $params ); @@ -65,23 +66,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 -- cgit v1.2.3-54-g00ecf