X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=program%2Fsteps%2Faddressbook%2Fexport.inc;fp=program%2Fsteps%2Faddressbook%2Fexport.inc;h=988dabf51def3fd3e2d677b178219946da5783dc;hb=b06ca1de90262dfb6d8eabe9a4037a8e36e930cc;hp=8ba1c08b617a9b1a6b7413d7060d31fc1199b6fd;hpb=5058e04171cbe6d82a65fc9d869ddef90e829e36;p=roundcube.git

diff --git a/program/steps/addressbook/export.inc b/program/steps/addressbook/export.inc
index 8ba1c08..988dabf 100644
--- a/program/steps/addressbook/export.inc
+++ b/program/steps/addressbook/export.inc
@@ -24,6 +24,7 @@
 // Use search result
 if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']]))
 {
+    $sort_col = $RCMAIL->config->get('addressbook_sort_col', 'name');
     $search  = (array)$_SESSION['search'][$_REQUEST['_search']];
     $records = array();
 
@@ -41,7 +42,7 @@ if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search
 
         while ($row = $result->next()) {
             $row['sourceid'] = $s;
-            $key = $row['name'] . ':' . $row['sourceid'];
+            $key = rcmail_contact_key($row, $sort_col);
             $records[$key] = $row;
         }
         unset($result);