From 3f37f9429ca89a74ecd47f828151879d7dcc9570 Mon Sep 17 00:00:00 2001 From: rvelices Date: Wed, 2 May 2012 20:25:34 +0000 Subject: batch manager - all/level filters sorts images using config order by git-svn-id: http://piwigo.org/svn/trunk@14689 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/batch_manager.php | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'admin/batch_manager.php') diff --git a/admin/batch_manager.php b/admin/batch_manager.php index 19dfea311..20508d576 100644 --- a/admin/batch_manager.php +++ b/admin/batch_manager.php @@ -257,12 +257,9 @@ SELECT id $query = ' SELECT id FROM '.IMAGES_TABLE.' -;'; + '.$conf['order_by']; - array_push( - $filter_sets, - array_from_query($query, 'id') - ); + $filter_sets[] = array_from_query($query, 'id'); } $filter_sets = trigger_event('perform_batch_manager_prefilters', $filter_sets, $_SESSION['bulk_manager_filter']['prefilter']); @@ -304,11 +301,9 @@ if (isset($_SESSION['bulk_manager_filter']['level'])) SELECT id FROM '.IMAGES_TABLE.' WHERE level '.$operator.' '.$_SESSION['bulk_manager_filter']['level'].' -;'; - array_push( - $filter_sets, - array_from_query($query, 'id') - ); + '.$conf['order_by']; + + $filter_sets[] = array_from_query($query, 'id'); } if (!empty($_SESSION['bulk_manager_filter']['tags'])) -- cgit v1.2.3