From d02cc8f1d825de35a9bb90c1ac25c5786a83ac3c Mon Sep 17 00:00:00 2001
From: flop25 <flop25@piwigo.org>
Date: Mon, 18 Feb 2013 18:55:16 +0000
Subject: bug:2845 added 'tags' as potential array for pwg.images.addSimple

git-svn-id: http://piwigo.org/svn/trunk@20814 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 include/ws_functions.inc.php | 19 +++++++++++++++----
 ws.php                       |  2 +-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/include/ws_functions.inc.php b/include/ws_functions.inc.php
index 7f0952ec3..199175bb7 100644
--- a/include/ws_functions.inc.php
+++ b/include/ws_functions.inc.php
@@ -1977,11 +1977,22 @@ SELECT *
   if (isset($params['tags']) and !empty($params['tags']))
   {
     $tag_ids = array();
-    $tag_names = preg_split('~(?<!\\\),~', $params['tags']);
-    foreach ($tag_names as $tag_name)
+    if (is_array($params[tags]))
     {
-      $tag_id = tag_id_from_tag_name(preg_replace('#\\\\*,#', ',', $tag_name));
-      array_push($tag_ids, $tag_id);
+      foreach ($params[tags] as $tag_name)
+      {
+        $tag_id = tag_id_from_tag_name($tag_name);
+        array_push($tag_ids, $tag_id);
+      }
+    }
+    else
+    {
+      $tag_names = preg_split('~(?<!\\\),~', $params['tags']);
+      foreach ($tag_names as $tag_name)
+      {
+        $tag_id = tag_id_from_tag_name(preg_replace('#\\\\*,#', ',', $tag_name));
+        array_push($tag_ids, $tag_id);
+      }
     }
 
     add_tags($tag_ids, array($image_id));
diff --git a/ws.php b/ws.php
index 9ebf537dc..61bb01276 100644
--- a/ws.php
+++ b/ws.php
@@ -279,7 +279,7 @@ function ws_addDefaultMethods( $arr )
         'default' => 0,
         'maxValue' => $conf['available_permission_levels']
         ),
-      'tags' => array('default' => null),
+      'tags' => array('default' => null, 'flags' => WS_PARAM_ACCEPT_ARRAY),
       'image_id' => array('default' => null),
       ),
     'POST method only.<br>Use the <b>image</b> field for uploading file.<br>Set the form encoding to "form-data"<br><b>category</b> is the numeric identifier of the destination category.<br>You can update an existing photo if you define an existing image_id.'
-- 
cgit v1.2.3