merge r10354 from trunk to branch 2.2

feature:2264
new trigger to add prefilter on batch manager

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

1 files changed, 3 insertions, 5 deletions

diff --git a/admin/batch_manager.php b/admin/batch_manager.php
index 232c84f08..20446e5d4 100644
--- a/admin/batch_manager.php
+++ b/admin/batch_manager.php
@@ -55,11 +55,7 @@ if (isset($_POST['submitFilter']))
 
   if (isset($_POST['filter_prefilter_use']))
   {
-    $prefilters = array('caddie', 'last import', 'with no album', 'with no tag', 'with no virtual album', 'duplicates', 'all photos');
-    if (in_array($_POST['filter_prefilter'], $prefilters))
-    {
-      $_SESSION['bulk_manager_filter']['prefilter'] = $_POST['filter_prefilter'];
-    }
+    $_SESSION['bulk_manager_filter']['prefilter'] = $_POST['filter_prefilter'];
   }
 
   if (isset($_POST['filter_category_use']))
@@ -253,6 +249,8 @@ SELECT id
       array_from_query($query, 'id')
       );
   }
+
+  $filter_sets = trigger_event('bulk_manager_prefilter', $filter_sets, $_SESSION['bulk_manager_filter']['prefilter']);
 }
 
 if (isset($_SESSION['bulk_manager_filter']['category']))