Ignore:
Timestamp:
Apr 3, 2011, 11:58:56 AM (13 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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2

    • Property svn:mergeinfo changed
      /trunk (added)merged: 10008
  • branches/2.2/admin/batch_manager_global.php

    r9916 r10009  
    118118  if ('add_tags' == $action)
    119119  {
    120     $tag_ids = get_fckb_tag_ids($_POST['add_tags']);
    121     add_tags($tag_ids, $collection);
    122 
    123     if ('with no tag' == $page['prefilter'])
    124     {
    125       redirect(get_root_url().'admin.php?page='.$_GET['page']);
     120    if (empty($_POST['add_tags']))
     121    {
     122      array_push($page['errors'], l10n('Select at least one tag'));
     123    }
     124    else
     125    {
     126      $tag_ids = get_fckb_tag_ids($_POST['add_tags']);
     127      add_tags($tag_ids, $collection);
     128
     129      if ('with no tag' == $page['prefilter'])
     130      {
     131        redirect(get_root_url().'admin.php?page='.$_GET['page']);
     132      }
    126133    }
    127134  }
Note: See TracChangeset for help on using the changeset viewer.