X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Flibs%2Fobjectcache%2FRedisBagOStuff.php;h=6e467dab3af5d56897c68073f5266971788e887a;hb=f445700ccc6f7f48158ae27d2cd13004675fd431;hp=87d26ef8fda463f6b1aff1ce2c0db9e872c07dd8;hpb=3aadf0409b455e9e3d924d4c90dbbc2fccf48240;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/libs/objectcache/RedisBagOStuff.php b/includes/libs/objectcache/RedisBagOStuff.php
index 87d26ef8fd..6e467dab3a 100644
--- a/includes/libs/objectcache/RedisBagOStuff.php
+++ b/includes/libs/objectcache/RedisBagOStuff.php
@@ -21,8 +21,9 @@
  */
 
 /**
- * Redis-based caching module for redis server >= 2.6.12
+ * Redis-based caching module for redis server >= 2.6.12 and phpredis >= 2.2.4
  *
+ * @see https://github.com/phpredis/phpredis/blob/d310ed7c8/Changelog.md
  * @note Avoid use of Redis::MULTI transactions for twemproxy support
  *
  * @ingroup Cache
@@ -143,7 +144,7 @@ class RedisBagOStuff extends MediumSpecificBagOStuff {
 		$e = null;
 		try {
 			// Note that redis does not return false if the key was not there
-			$result = ( $conn->delete( $key ) !== false );
+			$result = ( $conn->del( $key ) !== false );
 		} catch ( RedisException $e ) {
 			$result = false;
 			$this->handleException( $conn, $e );
@@ -269,7 +270,7 @@ class RedisBagOStuff extends MediumSpecificBagOStuff {
 				// Avoid delete() with array to reduce CPU hogging from a single request
 				$conn->multi( Redis::PIPELINE );
 				foreach ( $batchKeys as $key ) {
-					$conn->delete( $key );
+					$conn->del( $key );
 				}
 				$batchResult = $conn->exec();
 				if ( $batchResult === false ) {