aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2012-05-02 20:25:34 +0000
committerrvelices <rv-github@modusoptimus.com>2012-05-02 20:25:34 +0000
commit3f37f9429ca89a74ecd47f828151879d7dcc9570 (patch)
tree5e4127f19c29e0358e74b6fd6db39b054f065cf3 /admin
parent1307d0708e8116ad5e5524d311cddeca44a895f8 (diff)
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
Diffstat (limited to '')
-rw-r--r--admin/batch_manager.php15
1 files changed, 5 insertions, 10 deletions
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']))