From e7c6d43c6674bcf174c3d9cabf71f5f4f39be111 Mon Sep 17 00:00:00 2001 From: itsbruce Date: Wed, 31 Jul 2002 11:42:16 +0000 Subject: [PATCH] Fix full_address function to allow user setting always to override global one git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3196 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/addressbook.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/functions/addressbook.php b/functions/addressbook.php index c99b8e5c..0e2a44aa 100644 --- a/functions/addressbook.php +++ b/functions/addressbook.php @@ -210,8 +210,9 @@ class AddressBook { function full_address($row) { global $addrsrch_fullname, $datadir, $user; - if ($prefix = getPref($datadir, $user, 'addrsrch_fullname') or - isset($addrsrch_fullname) and $prefix = $addrsrch_fullname) { + if (($prefix = getPref($datadir, $user, 'addrsrch_fullname') or + isset($addrsrch_fullname) and $prefix = $addrsrch_fullname) + and $prefix !== 'noprefix') { $name = ($prefix === 'nickname') ? $row['nickname'] : $row['name']; return $name . ' <' . trim($row['email']) . '>'; -- 2.25.1