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

[stable24] Fix crop condition

1 files changed, 11 insertions, 3 deletions

diff --git a/lib/private/Preview/Generator.php b/lib/private/Preview/Generator.php
index e058a15bfa5..f9985bc299d 100644
--- a/lib/private/Preview/Generator.php
+++ b/lib/private/Preview/Generator.php
@@ -232,9 +232,17 @@ class Generator {
 
 		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;
+				}
 			}
 		}