diff --git a/PATCH_LIST.md b/PATCH_LIST.md index 46ecf48c..c087f8ff 100644 --- a/PATCH_LIST.md +++ b/PATCH_LIST.md @@ -7,6 +7,8 @@ https://www.drupal.org/node/1754162 //see https://www.drupal.org/node/1003788 # Modules : +Redis + - https://www.drupal.org/project/redis/issues/3074189 cer contentadminrelink entityreference @@ -23,7 +25,7 @@ node_export : - https://www.drupal.org/node/1911638 termreferencetree ?? views -views_rss_media +views_rss_media - https://www.drupal.org/node/2472409 - https://www.drupal.org/project/views_rss_media/issues/2149287 wysiwyg diff --git a/sites/all/modules/contrib/dev/redis/lib/Redis/Lock/PhpRedis.php b/sites/all/modules/contrib/dev/redis/lib/Redis/Lock/PhpRedis.php index f9ae845e..6cf626d2 100644 --- a/sites/all/modules/contrib/dev/redis/lib/Redis/Lock/PhpRedis.php +++ b/sites/all/modules/contrib/dev/redis/lib/Redis/Lock/PhpRedis.php @@ -108,7 +108,7 @@ class Redis_Lock_PhpRedis extends Redis_Lock_DefaultBackend { if ($client->get($key) == $id) { $client->multi(); - $client->delete($key); + $client->del($key); $client->exec(); } else { @@ -131,7 +131,7 @@ class Redis_Lock_PhpRedis extends Redis_Lock_DefaultBackend { $owner = $client->get($key); if (empty($owner) || $owner == $id) { - $client->delete($key); + $client->del($key); } } } diff --git a/sites/all/modules/contrib/dev/redis/redis-not-compatible-with-redis5-3074189-2.patch b/sites/all/modules/contrib/dev/redis/redis-not-compatible-with-redis5-3074189-2.patch new file mode 100644 index 00000000..df64c174 --- /dev/null +++ b/sites/all/modules/contrib/dev/redis/redis-not-compatible-with-redis5-3074189-2.patch @@ -0,0 +1,22 @@ +diff --git a/lib/Redis/Lock/PhpRedis.php b/lib/Redis/Lock/PhpRedis.php +index f9ae845..6cf626d 100644 +--- a/lib/Redis/Lock/PhpRedis.php ++++ b/lib/Redis/Lock/PhpRedis.php +@@ -108,7 +108,7 @@ class Redis_Lock_PhpRedis extends Redis_Lock_DefaultBackend { + + if ($client->get($key) == $id) { + $client->multi(); +- $client->delete($key); ++ $client->del($key); + $client->exec(); + } + else { +@@ -131,7 +131,7 @@ class Redis_Lock_PhpRedis extends Redis_Lock_DefaultBackend { + $owner = $client->get($key); + + if (empty($owner) || $owner == $id) { +- $client->delete($key); ++ $client->del($key); + } + } + }