Merge pull request #7388 from aleeks/clear_cache

Fix clear media cache
PrestaShop · Jan 25, 2017 · 9bd7899 · 9bd7899
2 parents 1caa3e8 + 68e1add
commit 9bd7899
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/classes/Media.php b/classes/Media.php
@@ -670,11 +670,14 @@ public static function cccJS($jsFiles)
      */
     public static function clearCache()
     {
-        foreach (array(_PS_THEME_DIR_.'cache') as $dir) {
-            if (file_exists($dir)) {
-                foreach (array_diff(scandir($dir), array('..', '.', 'index.php')) as $file) {
-                    Tools::deleteFile($dir.DIRECTORY_SEPARATOR.$file);
-                }
+        $files = array_merge(
+            glob(_PS_THEME_DIR_.'assets/cache/*'),
+            glob(_PS_THEME_DIR_.'cache/*')
+        );
+
+        foreach ($files as $file) {
+            if ('index.php' !== basename($file)) {
+                Tools::deleteFile($file);
             }
         }