aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2009-07-21 20:09:11 +0000
committerplegall <plg@piwigo.org>2009-07-21 20:09:11 +0000
commite36de08239746bbe2355ed12a78e1a71b0e59203 (patch)
tree32b56349e4c77899cbb1e587c2b66c87c433faae
parent537b8430a2b504175862aab799254d0dc312f2b4 (diff)
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
Diffstat (limited to '')
-rw-r--r--admin/include/functions.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/include/functions.php b/admin/include/functions.php
index 4178a285f..63a79a2bf 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -171,7 +171,7 @@ SELECT
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');
}