- if ((isset($addrsrch_fullname)) && ($addrsrch_fullname)) {
- $name = ($addrsrch_fullname === 'nickname') ? $row['nickname']
+ if (($prefix = getPref($data_dir, $username, 'addrsrch_fullname') or
+ isset($addrsrch_fullname) and $prefix = $addrsrch_fullname)
+ and $prefix !== 'noprefix') {
+ $name = ($prefix === 'nickname') ? $row['nickname']