aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2012-01-17 00:17:39 +0000
committerplegall <plg@piwigo.org>2012-01-17 00:17:39 +0000
commitb18e3c8a803b15fc72f95791072220afb23f46bf (patch)
treed815b81e501c6b626f53c915764c71caa40d7ecf
parentf7421e5789f6117ccab81ea53bf24d6cd77e95c7 (diff)
feature 2548 (multiple size): better delete derivatives in add_uploaded_file
function when performing an update of a photo. git-svn-id: http://piwigo.org/svn/trunk@12907 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/include/functions_upload.inc.php2
-rw-r--r--include/ws_functions.inc.php3
2 files changed, 2 insertions, 3 deletions
diff --git a/admin/include/functions_upload.inc.php b/admin/include/functions_upload.inc.php
index f53b2d09d..88440476a 100644
--- a/admin/include/functions_upload.inc.php
+++ b/admin/include/functions_upload.inc.php
@@ -292,6 +292,8 @@ SELECT
$update,
array('id' => $image_id)
);
+
+ delete_element_derivatives($image_id);
}
else
{
diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php
index 7216fc31c..895e08d9c 100644
--- a/include/ws_functions.inc.php
+++ b/include/ws_functions.inc.php
@@ -1755,9 +1755,6 @@ SELECT
$params['image_id'],
$image['md5sum'] // we force the md5sum to remain the same
);
-
- include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
- delete_element_derivatives($params['image_id']);
}
function ws_images_add($params, &$service)