Merge pull request #27828 from nextcloud/backport/27818/stable21

Pytal · web-flow · commit ff619feff12d · 2021-07-06T11:33:53.000-07:00
[stable21] Fix in locking cache check
diff --git a/lib/private/Memcache/Factory.php b/lib/private/Memcache/Factory.php
@@ -95,7 +95,7 @@ public function __construct(string $globalPrefix, ILogger $logger,
 				'{class}' => $distributedCacheClass, '{use}' => 'distributed'
 			]), $missingCacheHint);
 		}
-		if (!($lockingCacheClass && class_exists($distributedCacheClass) && $lockingCacheClass::isAvailable())) {
+		if (!($lockingCacheClass && class_exists($lockingCacheClass) && $lockingCacheClass::isAvailable())) {
 			// don't fallback since the fallback might not be suitable for storing lock
 			$lockingCacheClass = self::NULL_CACHE;
 		}

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ public function __construct(string $globalPrefix, ILogger $logger,`
`95`	`95`	`'{class}' => $distributedCacheClass, '{use}' => 'distributed'`
`96`	`96`	`]), $missingCacheHint);`
`97`	`97`	`}`
`98`		`- if (!($lockingCacheClass && class_exists($distributedCacheClass) && $lockingCacheClass::isAvailable())) {`
	`98`	`+ if (!($lockingCacheClass && class_exists($lockingCacheClass) && $lockingCacheClass::isAvailable())) {`
`99`	`99`	`// don't fallback since the fallback might not be suitable for storing lock`
`100`	`100`	`$lockingCacheClass = self::NULL_CACHE;`
`101`	`101`	`}`