Updates core.

[platal.git] / include / userset.inc.php

diff --git a/include/userset.inc.php b/include/userset.inc.php
index 62b5a02..8dc2794 100644 (file)
--- a/include/userset.inc.php
+++ b/include/userset.inc.php
@@ -425,17 +425,19 @@ class AddressesView implements PlView
     {
         $pids = $this->set->getIds(new PlLimit());
         $visibility = Visibility::defaultForRead(Visibility::VIEW_AX);
-        pl_cached_content_headers('text/x-csv', 1);
+        pl_cached_content_headers('text/x-csv', 'utf-8', 1, 'adresses.csv');
 
         $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();