X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=functions%2Faddressbook.php;h=b65f993b667d6a9630a8360957f3433d7536865b;hp=3408c83ff0e5bb8fb8d446b61b2dc6e360fde12f;hb=626de8786079042eb01012263fccd4e73dc04151;hpb=4b5049de2fa934c45599d6e4c74bf2bbee10d34d

diff --git a/functions/addressbook.php b/functions/addressbook.php
index 3408c83f..b65f993b 100644
--- a/functions/addressbook.php
+++ b/functions/addressbook.php
@@ -130,7 +130,8 @@ function addressbook_init($showerr = true, $onlylocal = false) {
      * in an array and change those values as needed instead of returning
      * the changed values.
      */
-    do_hook('abook_init', $temp=array(&$abook, &$r, &$onlylocal));
+    $temp = array(&$abook, &$r, &$onlylocal);
+    do_hook('abook_init', $temp);
     if (!$r && $showerr) {
         if ($abook_init_error!='') $abook_init_error.="\n";
         $abook_init_error.=_("Error initializing other address books.") . "\n" . $abook->error;
@@ -485,15 +486,14 @@ class AddressBook {
      * @return string email address with real name prepended
      */
     function full_address($row) {
-        global $addrsrch_fullname, $data_dir, $username;
-        $prefix = getPref($data_dir, $username, 'addrsrch_fullname');
-        if (($prefix != "" || (isset($addrsrch_fullname) &&
-            $prefix == $addrsrch_fullname)) && $prefix != 'noprefix') {
-            $name = ($prefix == 'nickname' ? $row['nickname'] : $row['name']);
-            return $name . ' <' . trim($row['email']) . '>';
-        } else {
+        global $data_dir, $username;
+        $addrsrch_fullname = getPref($data_dir, $username, 'addrsrch_fullname');
+        if ($addrsrch_fullname == 'fullname')
+            return $row['name'] . ' <' . trim($row['email']) . '>';
+        else if ($addrsrch_fullname == 'nickname')
+            return $row['nickname'] . ' <' . trim($row['email']) . '>';
+        else // "noprefix"
             return trim($row['email']);
-        }
     }
 
     /**