diff options
| author | rvelices <rv-github@modusoptimus.com> | 2014-04-30 18:43:45 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2014-04-30 18:43:45 +0000 |
| commit | 5e1cf61f2009d4d05ad4d95d1f56a84e2ddd0de2 (patch) | |
| tree | 0bf6b7e6b3caed6212d4d2ba271423310b78380f /admin/batch_manager.php | |
| parent | 8c5064a3305bc1432f7e3840bdea906de76d2a71 (diff) | |
batch manager prefilter all does not make a sql query if there is also another filter
git-svn-id: http://piwigo.org/svn/trunk@28318 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/batch_manager.php')
| -rw-r--r-- | admin/batch_manager.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/admin/batch_manager.php b/admin/batch_manager.php index 359e5603a..e041a8507 100644 --- a/admin/batch_manager.php +++ b/admin/batch_manager.php @@ -289,13 +289,15 @@ SELECT id break; case 'all_photos': - $query = ' + if ( count($_SESSION['bulk_manager_filter']) == 1 ) + {// make the query only if this is the only filter + $query = ' SELECT id FROM '.IMAGES_TABLE.' '.$conf['order_by']; - $filter_sets[] = array_from_query($query, 'id'); - + $filter_sets[] = array_from_query($query, 'id'); + } break; } |