Merged revision(s) r18459 from trunk:

bug:2756 feature:2737 on batch manager use "tag" url parameter instead of re-use "cat"

git-svn-id: http://piwigo.org/svn/branches/2.4@18460 68402e56-0260-453c-a942-63ccdbb3a9ee

1 files changed, 11 insertions, 11 deletions

diff --git a/admin/batch_manager.php b/admin/batch_manager.php
index 136f4d10e..0b9b1f77c 100644
--- a/admin/batch_manager.php
+++ b/admin/batch_manager.php
@@ -91,8 +91,7 @@ if (isset($_POST['submitFilter']))
     }
   }
 }
-
-if (isset($_GET['cat']))
+else if (isset($_GET['cat']))
 {
   if ('caddie' == $_GET['cat'])
   {
@@ -100,26 +99,27 @@ if (isset($_GET['cat']))
       'prefilter' => 'caddie'
       );
   }
-
-  if ('recent' == $_GET['cat'])
+  else if ('recent' == $_GET['cat'])
   {
     $_SESSION['bulk_manager_filter'] = array(
       'prefilter' => 'last import'
       );
   }
-
-  if (is_numeric($_GET['cat']))
+  else if (is_numeric($_GET['cat']))
   {
     $_SESSION['bulk_manager_filter'] = array(
       'category' => $_GET['cat']
       );
   }
-  
-  if (strpos($_GET['cat'],'tag-')===0)
+}
+else if (isset($_GET['tag']))
+{
+  if (is_numeric($_GET['tag']))
   {
-    $_SESSION['bulk_manager_filter']=array();
-    $_SESSION['bulk_manager_filter']['tags'] = array(intval(substr($_GET['cat'],4)));
-    $_SESSION['bulk_manager_filter']['tag_mode'] = 'AND';
+    $_SESSION['bulk_manager_filter'] = array(
+      'tags' => array($_GET['tag']),
+      'tag_mode' => 'AND',
+      );
   }
 }