From b5f020ee66b13bce8275a4d64faf8710c362a6d1 Mon Sep 17 00:00:00 2001 From: mistic100 Date: Thu, 4 Oct 2012 14:14:25 +0000 Subject: bug:2756 feature:2737 on batch manager use "tag" url parameter instead of re-use "cat" git-svn-id: http://piwigo.org/svn/trunk@18459 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/batch_manager.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'admin/batch_manager.php') diff --git a/admin/batch_manager.php b/admin/batch_manager.php index 48470b330..e144731d8 100644 --- a/admin/batch_manager.php +++ b/admin/batch_manager.php @@ -104,8 +104,7 @@ if (isset($_POST['submitFilter'])) } } } - -if (isset($_GET['cat'])) +else if (isset($_GET['cat'])) { if ('caddie' == $_GET['cat']) { @@ -113,26 +112,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', + ); } } -- cgit v1.2.3