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

diff --git a/functions/addressbook.php b/functions/addressbook.php
index c99b8e5ce6fd5b5aa432265782b69f2258493654..0e2a44aa421c83bed06383cc2c56cbaab2d19cca 100644 (file)
--- 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']) . '>';