summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
bd78856)
git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3191
7612ce4b-ef26-0410-bec9-
ea0150e637f0
*/
function full_address($row) {
*/
function full_address($row) {
- global $addrsrch_fullname;
+ global $addrsrch_fullname, $datadir, $user;
- if ((isset($addrsrch_fullname)) && ($addrsrch_fullname)) {
- $name = ($addrsrch_fullname === 'nickname') ? $row['nickname']
+ if ($prefix = getPref($datadir, $user, 'addrsrch_fullname') or
+ isset($addrsrch_fullname) and $prefix = $addrsrch_fullname) {
+ $name = ($prefix === 'nickname') ? $row['nickname']
: $row['name'];
return $name . ' <' . trim($row['email']) . '>';
} else {
: $row['name'];
return $name . ' <' . trim($row['email']) . '>';
} else {