Changeset 2321 for branches

Timestamp:

12/19/10 16:38:27 (17 months ago)

Author:

petsagouris

Message:

[Branch 1.5] Fixing the FileSystem::deleteFiles() as per Nick's comment refs #182

Files:

• branches/1.5/libs/FileSystem.php (modified) (1 diff)

branches/1.5/libs/FileSystem.php

@@ -70 +70 @@
         {
                 foreach (new DirectoryIterator($path) as $file) {
-                        $file = new SplFileInfo($file_name);
-                        if ($file->isFile()) {
-                                @unlink($path.$file->getFilename());
-                        }
-                        if ($delete_directories && $file->isDir()) {
-                                $this->delete_files($file->getRealPath(), TRUE, TRUE);
+                        if (!$file->isDot()) {
+                                if ($file->isFile()) {
+                                        unlink($file->getRealPath());
+                                }
+                                if ($delete_directories && $file->isDir()) {
+                                        self::deleteFiles($file->getRealPath(), TRUE, TRUE);
+                                }
                         }
                 }
                 if ($remove_directory && is_dir($path)) {
-                        @rmdir($path);
+                        rmdir($path);
                 }
                 return FALSE;