Changeset 10009

Timestamp:

Apr 3, 2011, 11:58:56 AM (14 years ago)

Author:

patdenice

Message:

Merge r10008 from trunk to branch 2.2
bug:2240
Notice is displayed if no tag entered in batch manager

Location:

branches/2.2

Files:

• . (modified) (1 prop)
• admin/batch_manager_global.php (modified) (1 diff)
• admin/themes/default/template/maintenance.tpl (modified) (1 prop)

branches/2.2/admin/batch_manager_global.php

@@ -118 +118 @@
   if ('add_tags' == $action)
   {
-    $tag_ids = get_fckb_tag_ids($_POST['add_tags']);
-    add_tags($tag_ids, $collection);
-
-    if ('with no tag' == $page['prefilter'])
-    {
-      redirect(get_root_url().'admin.php?page='.$_GET['page']);
+    if (empty($_POST['add_tags']))
+    {
+      array_push($page['errors'], l10n('Select at least one tag'));
+    }
+    else
+    {
+      $tag_ids = get_fckb_tag_ids($_POST['add_tags']);
+      add_tags($tag_ids, $collection);
+
+      if ('with no tag' == $page['prefilter'])
+      {
+        redirect(get_root_url().'admin.php?page='.$_GET['page']);
+      }
     }
   }