From 235e0e235d4d546e105433236fb3f424f4a3e5d6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Mon, 3 Oct 2011 20:50:02 +0200 Subject: [PATCH] Only performs seach if pids where found. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Jacob --- include/userset.inc.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/include/userset.inc.php b/include/userset.inc.php index 62b5a02..1ff19ec 100644 --- a/include/userset.inc.php +++ b/include/userset.inc.php @@ -429,13 +429,15 @@ class AddressesView implements PlView $csv = fopen('php://output', 'w'); fputcsv($csv, array('adresses'), ';'); - $res = XDB::query('SELECT pd.public_name, pa.postalText - FROM profile_addresses AS pa - INNER JOIN profile_display AS pd ON (pd.pid = pa.pid) - WHERE pa.type = \'home\' AND pa.pub IN (\'public\', \'ax\') AND FIND_IN_SET(\'mail\', pa.flags) AND pa.pid IN {?} - GROUP BY pa.pid', $pids); - foreach ($res->fetchAllAssoc() as $item) { - fputcsv($csv, $item, ';'); + if (!empty($pids)) { + $res = XDB::query('SELECT pd.public_name, pa.postalText + FROM profile_addresses AS pa + INNER JOIN profile_display AS pd ON (pd.pid = pa.pid) + WHERE pa.type = \'home\' AND pa.pub IN (\'public\', \'ax\') AND FIND_IN_SET(\'mail\', pa.flags) AND pa.pid IN {?} + GROUP BY pa.pid', $pids); + foreach ($res->fetchAllAssoc() as $item) { + fputcsv($csv, $item, ';'); + } } fclose($csv); exit(); -- 2.1.4