Merge pull request #32513 from nextcloud/backport/32496/stable24

[stable24] Fix crop condition
nextcloud · Jun 10, 2022 · 4e870ea · 4e870ea
2 parents ddac16b + 634a15a
commit 4e870ea
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/lib/private/Preview/Generator.php b/lib/private/Preview/Generator.php
@@ -232,9 +232,17 @@ private function getSmallImagePreview(ISimpleFolder $previewFolder, File $file,
 
 		foreach ($nodes as $node) {
 			$name = $node->getName();
-			if (($prefix === '' || strpos($name, $prefix) === 0)
-				&& (str_starts_with($name, '256-256-crop') && $crop || str_starts_with($name, '256-256') && !$crop)) {
-				return $node;
+			if (($prefix === '' || str_starts_with($name, $prefix))) {
+				// Prefix match
+				if (str_starts_with($name, $prefix . '256-256-crop') && $crop) {
+					// Cropped image
+					return $node;
+				}
+
+				if (str_starts_with($name, $prefix . '256-256.') && !$crop) {
+					// Uncropped image
+					return $node;
+				}
 			}
 		}