aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2013-04-19 20:18:04 +0000
committerplegall <plg@piwigo.org>2013-04-19 20:18:04 +0000
commitf49d0248e47e22c20c9aa8c9b52eb0ff9b2c555a (patch)
treed59b046978af73e4fb3ce6da0e6c066beadb508b /include
parent22298916c81e26dda1530886e7d258c4151f57ad (diff)
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/branches/2.5@22301 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
-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'])
{