Merge r10008 from trunk to branch 2.2

bug:2240
Notice is displayed if no tag entered in batch manager

git-svn-id: http://piwigo.org/svn/branches/2.2@10009 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice
2011-04-03 09:58:56 +00:00
parent eccc2dd434
commit e0d8b5893c
+12 -5
View File
@@ -117,12 +117,19 @@ DELETE
if ('add_tags' == $action)
{
$tag_ids = get_fckb_tag_ids($_POST['add_tags']);
add_tags($tag_ids, $collection);
if ('with no tag' == $page['prefilter'])
if (empty($_POST['add_tags']))
{
redirect(get_root_url().'admin.php?page='.$_GET['page']);
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']);
}
}
}