diff --git a/module/search/model.php b/module/search/model.php index b6ceed5eb9..cdacb0a94b 100644 --- a/module/search/model.php +++ b/module/search/model.php @@ -180,7 +180,7 @@ class searchModel extends model if($hasUser) { - $users = $this->loadModel('user')->getPairs(); + $users = $this->loadModel('user')->getPairs('realname'); $users['$@me'] = $this->lang->search->me; } if($hasProduct) $products = array('' => '') + $this->loadModel('product')->getPairs(); diff --git a/module/user/model.php b/module/user/model.php index ee9adcebda..041997a649 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -64,7 +64,7 @@ class userModel extends model /** * Get the account=>relaname pairs. * - * @param string $params noletter|noempty|noclosed|nodeleted|withguest|pofirst|devfirst|qafirst|pmfirst, can be sets of theme + * @param string $params noletter|noempty|noclosed|nodeleted|withguest|pofirst|devfirst|qafirst|pmfirst|realname, can be sets of theme * @param string $usersToAppended account1,account2 * @access public * @return array @@ -98,7 +98,7 @@ class userModel extends model { $firstLetter = ucfirst(substr($account, 0, 1)) . ':'; if(strpos($params, 'noletter') !== false) $firstLetter = ''; - $users[$account] = $firstLetter . ($user->deleted ? $account : ($user->realname ? $user->realname : $account)); + $users[$account] = $firstLetter . (($user->deleted and strpos($params, 'realname') === false) ? $account : ($user->realname ? $user->realname : $account)); } /* Append empty, closed, and guest users. */