#259220 by drewish: Backporting _imagecache_recursive_delete() from the D6 version.

#311813 by thePanz: Warning on Flush of a Preset.

diff --git a/imagecache.module b/imagecache.module
index 6677be2..3778302 100644 (file)
--- a/imagecache.module
+++ b/imagecache.module
@@ -643,15 +643,24 @@ function _imagecache_keyword_filter($value, $current_pixels, $new_pixels) {
  * @param string $path
  *   A filepath relative to file_directory_path.
  */
-function _imagecache_recursive_delete($dir) {
-  $d = dir($dir);
-  while (($entry = $d->read()) !== false) {
-    if ($entry == '.' || $entry == '..') continue;
-    $path = $dir .'/'. $entry;
-    if (is_file($path)) unlink($path);
-    if (is_dir($path)) _imagecache_recursive_delete($path);
-  }
-  rmdir($dir);
+function _imagecache_recursive_delete($path) {
+  if (is_file($path) || is_link($path)) {
+    unlink($path);
+  }
+  elseif (is_dir($path)) {
+    $d = dir($path);
+    while (($entry = $d->read()) !== false) {
+      if ($entry == '.' || $entry == '..') continue;
+      $entry_path = $path .'/'. $entry;
+      _imagecache_recursive_delete($entry_path);
+    }
+    $d->close();
+    rmdir($path);
+  }
+  else {
+    watchdog('imagecache', t('Unknown file type(%path) stat: %stat ',
+              array('%path' => $path,  '%stat' => print_r(stat($path),1))), WATCHDOG_ERROR);
+  }
 }
 
 /**