Changeset 647784

Timestamp:

01/04/2013 09:45:10 AM (13 years ago)

Author:

ti2m

Message:

empty directory remove fix

File:

• edge-suite/trunk/includes/edge-suite-general.php (modified) (2 diffs)

edge-suite/trunk/includes/edge-suite-general.php

@@ -145 +145 @@
   $files = list_files($dir);
   $matching_files = array();
-  foreach ($files as $file) {
-    if (preg_match($pattern, $file)) {
-      $matching_files[] = $file;
+  if($files !== FALSE){
+    foreach ($files as $file) {
+      if (preg_match($pattern, $file)) {
+        $matching_files[] = $file;
+      }
     }
   }
@@ -154 +156 @@
 
 function rmdir_recursive($dir) {
-  //global $wp_filesystem;
-  foreach(glob($dir . '/*') as $file) {
-    if(@is_dir($file))
-      rmdir_recursive($file);
-    else
-      @unlink($file);
+  $files = glob($dir . '/*');
+  if($files !== FALSE){
+    foreach($files as $file) {
+      if(@is_dir($file))
+        rmdir_recursive($file);
+      else
+        @unlink($file);
+    }
   }
   @rmdir($dir);