Merge branch 'release/1.10.54'

Author: rhukster

CHANGELOG.md

@@ -1,4 +1,11 @@
 
+# v1.10.54
+## 08/07/2026
+
+1. [](#bugfix)
+    * Deleting a media file whose name contains a bracket or a similar character now removes its retina copies and metadata, which were previously left behind.
+    * Deleting a media file no longer also removes files belonging to a different item whose name ends with the same text, so deleting `banner.jpg` leaves `my-banner@2x.jpg` alone.
+
 # v1.10.53
 ## 07/21/2026
 

blueprints.yaml

@@ -1,7 +1,7 @@
 name: Admin Panel
 slug: admin
 type: plugin
-version: 1.10.53
+version: 1.10.54
 description: Adds an advanced administration panel to manage your site
 icon: empire
 author:

classes/plugin/AdminBaseController.php

@@ -1092,8 +1092,13 @@ public function taskRemoveMedia($filename = null)
 
             $fileParts = Utils::pathinfo($filename);
 
+            // The extension was the one part left unescaped here, and the pattern
+            // was unanchored, so a name could match as a suffix of a longer one.
+            $regex_pattern = '/^(?:' . preg_quote((string)($fileParts['filename'] ?? ''), '/')
+                . '@\d+x\.' . preg_quote((string)($fileParts['extension'] ?? ''), '/')
+                . '(?:\.meta\.yaml)?|' . preg_quote($fileParts['basename'], '/') . '\.meta\.yaml)$/';
+
             foreach (scandir($fileParts['dirname']) as $file) {
-                $regex_pattern = '/' . preg_quote($fileParts['filename'], '/') . "@\d+x\." . $fileParts['extension'] . "(?:\.meta\.yaml)?$|" . preg_quote($fileParts['basename'], '/') . "\.meta\.yaml$/";
                 if (preg_match($regex_pattern, $file)) {
                     $path = $fileParts['dirname'] . '/' . $file;
                     @unlink($path);

classes/plugin/AdminController.php

@@ -2504,14 +2504,29 @@ protected function taskDelmedia()
         }
 
         // Remove Extra Files
+        // Escape the filename before it becomes part of the pattern, otherwise a
+        // regex metacharacter in the name (`|`, `.`, `+`, `[`, ...) changes what
+        // the sweep matches: `a[b.jpg` makes the pattern invalid so the cleanup
+        // silently does nothing, and an alternation reaches unrelated files in the
+        // page folder. Anchored so a name is not matched as a suffix of a longer
+        // one, which is what let deleting `banner.jpg` take `my-banner@2x.jpg`.
+        $preg_name = preg_quote((string)($fileParts['filename'] ?? ''), '/');
+        $preg_ext = preg_quote((string)($fileParts['extension'] ?? ''), '/');
+        $preg_filename = preg_quote($filename, '/');
+        $regex_pattern = "/^(?:{$preg_name}@\d+x\.{$preg_ext}(?:\.meta\.yaml)?|{$preg_filename}\.meta\.yaml)$/";
+
         foreach (scandir($media->getPath(), SCANDIR_SORT_NONE) as $file) {
-            if (preg_match("/{$fileParts['filename']}@\d+x\.{$fileParts['extension']}(?:\.meta\.yaml)?$|{$filename}\.meta\.yaml$/", $file)) {
+            if (preg_match($regex_pattern, $file)) {
 
                 $targetPath = $media->getPath() . '/' . $file;
                 if ($locator->isStream($targetPath)) {
                     $targetPath = $locator->findResource($targetPath, true, true);
                 }
 
+                if (!is_file($targetPath)) {
+                    continue;
+                }
+
                 $result = unlink($targetPath);
 
                 if (!$result) {