From ba36dd03f6f7005a6e35ec02e4ff9a58f95be1c3 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sat, 11 Feb 2012 11:38:46 +0000
Subject: Backported r5850 to 0.7 branch

---
 program/steps/addressbook/list.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'program/steps/addressbook')

diff --git a/program/steps/addressbook/list.inc b/program/steps/addressbook/list.inc
index b4b7306a6..71196b4bb 100644
--- a/program/steps/addressbook/list.inc
+++ b/program/steps/addressbook/list.inc
@@ -31,6 +31,7 @@ if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search
         $page = isset($_SESSION['page']) ? $_SESSION['page'] : 1;
 
     $_SESSION['page'] = $page;
+    $sort_col = $this->config->get('addressbook_sort_col', 'name');
 
     // Get records from all sources
     foreach ($search as $s => $set) {
@@ -46,7 +47,7 @@ if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search
 
         while ($row = $result->next()) {
             $row['sourceid'] = $s;
-            $key = $row['name'] . ':' . $row['sourceid'];
+            $key = $row[$sort_col] . ':' . $row['sourceid'];
             $records[$key] = $row;
         }
         unset($result);
-- 
cgit v1.2.3