From 71e8cc3bce5053ca986a95ef119101d15317ddc6 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 25 Jul 2011 11:48:50 +0000
Subject: - Fixed display name on contact lists

---
 program/steps/addressbook/func.inc | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'program/steps/addressbook/func.inc')

diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc
index f372c1c33..6b3ebad08 100644
--- a/program/steps/addressbook/func.inc
+++ b/program/steps/addressbook/func.inc
@@ -294,8 +294,13 @@ function rcmail_js_contacts_list($result, $prefix='')
         }
 
         // format each col
-        foreach ($a_show_cols as $col)
-            $a_row_cols[$col] = Q($row[$col]);
+        foreach ($a_show_cols as $col) {
+            $val = $row[$col];
+            if ($val == '' && $col == 'name') {
+                $val = rcube_addressbook::compose_display_name($row, true);
+            }
+            $a_row_cols[$col] = Q($val);
+        }
 
         $OUTPUT->command($prefix.'add_contact_row', $row['ID'], $a_row_cols);
     }
-- 
cgit v1.2.3