merge r3656 from branch 2.0 to trunk

feature 953: avoid fatal error when delete a photo (added with pwg.images.add API) and the file doesn't not exist on the filesystem. git-svn-id: http://piwigo.org/svn/trunk@3657 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Jul 21, 2009 · e36de08 · e36de08
1 parent 537b843
commit e36de08
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/admin/include/functions.php b/admin/include/functions.php
@@ -171,7 +171,7 @@ function delete_elements($ids, $physical_deletion=false)
 
       foreach (array($file_path, $thumbnail_path, $high_path) as $path)
       {
-        if (isset($path) and !unlink($path))
+        if (isset($path) and is_file($path) and !unlink($path))
         {
           die('"'.$path.'" cannot be removed');
         }