From fac0deea981a2642d3dd3173fd3f481a4b480b99 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Fri, 26 May 2017 18:34:12 -0600
Subject: [PATCH] And in remove media

---
 classes/adminbasecontroller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/adminbasecontroller.php b/classes/adminbasecontroller.php
index fc8dd85b..ab73efc2 100644
--- a/classes/adminbasecontroller.php
+++ b/classes/adminbasecontroller.php
@@ -924,7 +924,7 @@ class AdminBaseController
             $fileParts = pathinfo($filename);
 
             foreach (scandir($fileParts['dirname']) as $file) {
-                $regex_pattern = "/" . preg_quote($fileParts['filename']) . "@\d+x\." . $fileParts['extension'] . "$|" . preg_quote($fileParts['basename']) . ".meta.yaml$/";
+                $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);