From 5e1cf61f2009d4d05ad4d95d1f56a84e2ddd0de2 Mon Sep 17 00:00:00 2001
From: rvelices <rv-github@modusoptimus.com>
Date: Wed, 30 Apr 2014 18:43:45 +0000
Subject: 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
---
 admin/batch_manager.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'admin/batch_manager.php')

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;
   }
 
-- 
cgit v1.2.3