Fix crop condition

Make sure that when fetching the image from the cache we don't
accidentally fetch the cropped image just because it also start with
256-256

Signed-off-by: Carl Schwan <carl@carlschwan.eu>

diff --git a/lib/private/Preview/Generator.php b/lib/private/Preview/Generator.php
index e058a15bfa5536a6a7891f41850e34e7b2527a4b..f9985bc299d54c9608b273589a6c76dc547fadec 100644 (file)
--- 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;
+                               }
                        }
                }