Changeset 20814

Timestamp:

Feb 18, 2013, 7:55:16 PM (11 years ago)

Author:

flop25

Message:

bug:2845
added 'tags' as potential array for pwg.images.addSimple

Location:

trunk

Files:

• include/ws_functions.inc.php (modified) (1 diff)
• ws.php (modified) (1 diff)

trunk/include/ws_functions.inc.php

@@ -1978 +1978 @@
   {
     $tag_ids = array();
-    $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);
+    if (is_array($params[tags]))
+    {
+      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);
+      }
     }
 

trunk/ws.php

@@ -280 +280 @@
         'maxValue' => $conf['available_permission_levels']
         ),
-      'tags' => array('default' => null),
+      'tags' => array('default' => null, 'flags' => WS_PARAM_ACCEPT_ARRAY),
       'image_id' => array('default' => null),
       ),