From da89cf293753cfbfbe1f6cedcbb5a5d22aed45db Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 26 Jul 2011 17:21:26 +0000
Subject: Always show address book name if multiple books are configured; fix
 styling

---
 program/steps/addressbook/show.inc | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

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

diff --git a/program/steps/addressbook/show.inc b/program/steps/addressbook/show.inc
index fc983e60b..729cb3487 100644
--- a/program/steps/addressbook/show.inc
+++ b/program/steps/addressbook/show.inc
@@ -34,13 +34,7 @@ if ($cid && ($record = $CONTACTS->get_record($cid, true))) {
 }
 
 // get address book name (for display)
-if ($_SESSION['addressbooks_count'] > 1) {
-    $name = $CONTACTS->get_name();
-    if (!$name && $source == 0) {
-        $name = rcube_label('personaladrbook');
-    }
-    $OUTPUT->set_env('sourcename', $name);
-}
+rcmail_set_sourcename($CONTACTS);
 
 // return raw photo of the given contact
 if ($RCMAIL->action == 'photo') {
-- 
cgit v1.2.3