Skip redundant prepare_for_export() calls

10 years ago · 1e09be8a95
parent 2d52080ee1
commit 1e09be8a95
1 changed files with 3 additions and 1 deletions
--- a/program/steps/addressbook/export.inc
+++ b/program/steps/addressbook/export.inc
@ -103,7 +103,9 @@ header('Content-Type: text/x-vcard; charset='.RCUBE_CHARSET);
 header('Content-Disposition: attachment; filename="contacts.vcf"');

 while ($result && ($row = $result->next())) {
-    prepare_for_export($row, $CONTACTS);
+    if ($CONTACTS) {
+        prepare_for_export($row, $CONTACTS);
+    }

    // fix folding and end-of-line chars
    $row['vcard'] = preg_replace('/\r|\n\s+/', '', $row['vcard']);