diff --git a/lib/Controller/AdminController.php b/lib/Controller/AdminController.php index bab6b569c..cb2954120 100644 --- a/lib/Controller/AdminController.php +++ b/lib/Controller/AdminController.php @@ -78,9 +78,9 @@ public function checkPreviewer(string $previewer): Http\Response { if (!isset($this->previewers[$previewer])) { return new JSONResponse([], Http::STATUS_BAD_REQUEST); } - $previewer = $this->previewers[$previewer]; + $previewerImp = $this->previewers[$previewer]; $test = new Bookmark(); $test->setUrl('https://nextcloud.com/'); - return new Http\DataDisplayResponse($previewer->getImage($test)?->getData() ?? ''); + return new Http\DataDisplayResponse($previewerImp->getImage($test)?->getData() ?? ''); } } diff --git a/lib/Service/BookmarkPreviewer.php b/lib/Service/BookmarkPreviewer.php index 035fed1a1..ac6dd1f05 100644 --- a/lib/Service/BookmarkPreviewer.php +++ b/lib/Service/BookmarkPreviewer.php @@ -99,12 +99,14 @@ public function getImage($bookmark, $cacheOnly = false): ?IImage { } catch (NotFoundException $e) { } catch (NotPermittedException $e) { } + if ($cacheOnly) { + continue; + } $image = $previewer->getImage($bookmark, $cacheOnly); if (isset($image)) { $this->cache->set($key, $image->serialize(), self::CACHE_TTL); return $image; } - $this->cache->set($key, 'null', self::CACHE_TTL); }