merge r10380 from trunk to branch 2.2

feature:2264
Modify triggers for prefilters: there is now two triggers.
Order prefilters by alphabetic order.

git-svn-id: http://piwigo.org/svn/branches/2.2@10381 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
patdenice
2011-04-15 12:08:56 +00:00
parent 7a2bc12900
commit b3e98a2dd2
3 changed files with 25 additions and 12 deletions
+1 -1
View File
@@ -250,7 +250,7 @@ SELECT id
);
}
$filter_sets = trigger_event('bulk_manager_prefilter', $filter_sets, $_SESSION['bulk_manager_filter']['prefilter']);
$filter_sets = trigger_event('perform_batch_manager_prefilters', $filter_sets, $_SESSION['bulk_manager_filter']['prefilter']);
}
if (isset($_SESSION['bulk_manager_filter']['category']))