aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2013-04-19 20:19:15 +0000
committerplegall <plg@piwigo.org>2013-04-19 20:19:15 +0000
commitc6606fd585f3c60b06995c78062cfadc18165de2 (patch)
tree1594c09b9319046a3ba95d420c96112cdcc5f01d
parent0a6928b029c43d0856bfb9be04d7f5cd818aab86 (diff)
merge r22301 from branch 2.5 to trunk
bug 2892 fixed: no more error when tag_ids input parameter is empty (but provided) on pwg.images.setInfo. git-svn-id: http://piwigo.org/svn/trunk@22302 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/ws_functions.inc.php12
1 files changed, 11 insertions, 1 deletions
diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php
index c0a0be246..73f8e9942 100644
--- a/include/ws_functions.inc.php
+++ b/include/ws_functions.inc.php
@@ -2620,7 +2620,17 @@ SELECT *
// and now, let's create tag associations
if (isset($params['tag_ids']))
{
- $tag_ids = explode(',', $params['tag_ids']);
+ $tag_ids = array();
+
+ foreach (explode(',', $params['tag_ids']) as $candidate)
+ {
+ $candidate = trim($candidate);
+
+ if (preg_match(PATTERN_ID, $candidate))
+ {
+ $tag_ids[] = $candidate;
+ }
+ }
if ('replace' == $params['multiple_value_mode'])
{