#373502 by drewish and sun: Add function to delete unmanaged files recurisevely (with tests).

1 files changed, 1 insertions, 22 deletions

diff --git a/modules/simpletest/simpletest.module b/modules/simpletest/simpletest.module
index 39c08fecb..5476a9795 100644
--- a/modules/simpletest/simpletest.module
+++ b/modules/simpletest/simpletest.module
@@ -550,7 +550,7 @@ function simpletest_clean_temporary_directories() {
   foreach ($files as $file) {
     $path = file_directory_path() . '/' . $file;
     if (is_dir($path) && preg_match('/^simpletest\d+/', $file)) {
-      simpletest_clean_temporary_directory($path);
+      file_unmanaged_delete_recursive($path);
       $count++;
     }
   }
@@ -564,27 +564,6 @@ function simpletest_clean_temporary_directories() {
 }
 
 /**
- * Remove all files from specified directory and then remove directory.
- *
- * @param string $path Directory path.
- */
-function simpletest_clean_temporary_directory($path) {
-  $files = scandir($path);
-  foreach ($files as $file) {
-    if ($file != '.' && $file != '..') {
-      $file_path = "$path/$file";
-      if (is_dir($file_path)) {
-        simpletest_clean_temporary_directory($file_path);
-      }
-      else {
-        file_unmanaged_delete($file_path);
-      }
-    }
-  }
-  rmdir($path);
-}
-
-/**
  * Clear the test results tables.
  */
 function simpletest_clean_results_table() {