upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-22 14:50:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 53

stricter check if thumbnail is cached

Browse source
This commit is contained in:
Robin Appelman 2015-07-17 14:44:24 +02:00
parent 884e2fcd6e
commit dc49e76747
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/private/preview.php
View file

@ -479,7 +479,7 @@ class Preview {
$preview = $this->buildCachePath($fileId, $previewWidth, $previewHeight);
// This checks if we have a preview of those exact dimensions in the cache
if ($this->thumbnailSizeExists($allThumbnails, $previewWidth, $previewHeight)) {
if ($this->thumbnailSizeExists($allThumbnails, basename($preview))) {
return $preview;
}
@ -528,16 +528,13 @@ class Preview {
* Check if a specific thumbnail size is cached
*
* @param FileInfo[] $allThumbnails the list of all our cached thumbnails
* @param int $width
* @param int $height
* @param string $name
* @return bool
*/
private function thumbnailSizeExists($allThumbnails, $width, $height) {
private function thumbnailSizeExists($allThumbnails, $name) {
foreach ($allThumbnails as $thumbnail) {
$name = $thumbnail['name'];
list($cachedWidth, $cachedHeight) = $this->getDimensionsFromFilename($name);
if ($cachedWidth === $width && $cachedHeight === $height) {
if ($name === $thumbnail->getName()) {
return true;
}
}