Merge pull request #55326 from nextcloud/backport/55289/stable32

provokateurin · web-flow · commit 9667e8c7f5fb · 2025-10-07T18:45:51.000+02:00
diff --git a/lib/private/OCM/OCMDiscoveryService.php b/lib/private/OCM/OCMDiscoveryService.php
@@ -84,9 +84,11 @@ public function discover(string $remote, bool $skipCache = false): ICapabilityAw
 					throw new OCMProviderException('Previous discovery failed.');
 				}
 
-				$provider->import(json_decode($cached ?? '', true, 8, JSON_THROW_ON_ERROR) ?? []);
-				$this->remoteProviders[$remote] = $provider;
-				return $provider;
+				if ($cached !== null) {
+					$provider->import(json_decode($cached, true, 8, JSON_THROW_ON_ERROR) ?? []);
+					$this->remoteProviders[$remote] = $provider;
+					return $provider;
+				}
 			} catch (JsonException|OCMProviderException $e) {
 				$this->logger->warning('cache issue on ocm discovery', ['exception' => $e]);
 			}

Original file line number	Diff line number	Diff line change
`@@ -84,9 +84,11 @@ public function discover(string $remote, bool $skipCache = false): ICapabilityAw`
`84`	`84`	`throw new OCMProviderException('Previous discovery failed.');`
`85`	`85`	`}`
`86`	`86`
`87`		`- $provider->import(json_decode($cached ?? '', true, 8, JSON_THROW_ON_ERROR) ?? []);`
`88`		`- $this->remoteProviders[$remote] = $provider;`
`89`		`- return $provider;`
	`87`	`+ if ($cached !== null) {`
	`88`	`+ $provider->import(json_decode($cached, true, 8, JSON_THROW_ON_ERROR) ?? []);`
	`89`	`+ $this->remoteProviders[$remote] = $provider;`
	`90`	`+ return $provider;`
	`91`	`+ }`
`90`	`92`	`} catch (JsonException\|OCMProviderException $e) {`
`91`	`93`	`$this->logger->warning('cache issue on ocm discovery', ['exception' => $e]);`
`92`	`94`	`}`