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

[mark at devel.lifetype.net]

Author: mark
Date: 2007-03-28 12:50:56 -0400 (Wed, 28 Mar 2007)
New Revision: 5210

Modified:
   plog/branches/lifetype-1.2/class/file/file.class.php
Log:
Weird! the error message still there. Revert the last modification in svn rev 5209. And add @ before unlink and rmdir to avoid annoying error messages.

Modified: plog/branches/lifetype-1.2/class/file/file.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/file/file.class.php	2007-03-28 14:15:40 UTC (rev 5209)
+++ plog/branches/lifetype-1.2/class/file/file.class.php	2007-03-28 16:50:56 UTC (rev 5210)
@@ -224,9 +224,9 @@
                 return false;
 			 
 			 if( File::isDir( $file ))
-				 $result = rmdir( $file );
+				 $result = @rmdir( $file );
 			 else
-				 $result = unlink( $file );
+				 $result = @unlink( $file );
 			 
 			 return $result;
 		 }
@@ -272,13 +272,12 @@
 						File::deleteDir( $file, $recursive, $onlyFiles, $excludedFiles );
 					}
 				}
-				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 );
-						}
+
+				// 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 );
 					}
 				}
 			}