[pLog-svn] r5209 - plog/branches/lifetype-1.2/class/file

[mark at devel.lifetype.net]

Author: mark
Date: 2007-03-28 10:15:40 -0400 (Wed, 28 Mar 2007)
New Revision: 5209

Modified:
   plog/branches/lifetype-1.2/class/file/file.class.php
Log:
Fixed a bug of deleteDir()

Modified: plog/branches/lifetype-1.2/class/file/file.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/file/file.class.php	2007-03-28 10:44:26 UTC (rev 5208)
+++ plog/branches/lifetype-1.2/class/file/file.class.php	2007-03-28 14:15:40 UTC (rev 5209)
@@ -272,12 +272,13 @@
 						File::deleteDir( $file, $recursive, $onlyFiles, $excludedFiles );
 					}
 				}
-
-				// check if the filename is in the list of files we must not delete
-				if(array_search(basename( $file ), $excludedFiles) === false) {
-				    // File::delete can remove empty folders as well as files
-				    if( File::isReadable( $file )) {
-					    File::delete( $file );
+				else {
+					// check if the filename is in the list of files we must not delete
+					if(array_search(basename( $file ), $excludedFiles) === false) {
+					    // File::delete can remove empty folders as well as files
+					    if( File::isReadable( $file )) {
+						    File::delete( $file );
+						}
 					}
 				}
 			}