Changeset 11853 for trunk/admin/include/functions.php

Timestamp:

Jul 30, 2011, 6:49:02 AM (13 years ago)

Author:

rvelices

Message:

feature 2387: addd a filter by tag in the batch manager

File:

• trunk/admin/include/functions.php (modified) (5 diffs)

trunk/admin/include/functions.php

@@ -2049 +2049 @@
   while ($row = pwg_db_fetch_assoc($result))
   {
-    if (preg_match_all('#\[lang=(.*?)\](.*?)\[/lang\]#is', $row['tag_name'], $matches))
+    if (preg_match_all('#\[lang=(.*?)\](.*?)\[/lang\]#is', $row['name'], $matches))
     {
       foreach ($matches[2] as $tag_name)
@@ -2057 +2057 @@
           array(
             'name' => trigger_event('render_tag_name', $tag_name),
-            'id' => '~~'.$row['tag_id'].'~~',
+            'id' => '~~'.$row['id'].'~~',
             )
           );
@@ -2065 +2065 @@
     }
     
-    if (strlen($row['tag_name']) > 0)
+    if (strlen($row['name']) > 0)
     {
       array_push(
         $taglist,
         array(
-          'name' => trigger_event('render_tag_name', $row['tag_name']),
-          'id' => '~~'.$row['tag_id'].'~~',
+          'name' => trigger_event('render_tag_name', $row['name']),
+          'id' => '~~'.$row['id'].'~~',
           )
         );
@@ -2083 +2083 @@
 }
 
-function get_tag_ids($raw_tags)
+function get_tag_ids($raw_tags, $allow_create=true)
 {
   // In $raw_tags we receive something like array('~~6~~', '~~59~~', 'New
@@ -2099 +2099 @@
       array_push($tag_ids, $matches[1]);
     }
-    else
+    elseif ($allow_create)
     {
       // we have to create a new tag
-      array_push(
-        $tag_ids,
-        tag_id_from_tag_name($raw_tag)
-        );
+      $tag_ids[] = tag_id_from_tag_name($raw_tag);
     }
   }