diff options
| author | Christopher Geelen <christopher.geelen@vinotion.nl> | 2016-07-27 13:58:23 +0200 |
|---|---|---|
| committer | Christopher Geelen <christopher.geelen@vinotion.nl> | 2016-07-27 13:58:23 +0200 |
| commit | 24745182724ca69092554eb5946e31584420f68a (patch) | |
| tree | 386cdf7a8d7bf7ad2d80d938333bafbaf0fedcbc /app/Helper/UserHelper.php | |
| parent | 160c0b885eb4f1a1a1baa2b6b9fc6d99fdb80d0c (diff) | |
| parent | 9649f7ba82ba7fe6a470abfe9f65e214cc68fa34 (diff) | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
app/Job/NotificationJob.php
Diffstat (limited to 'app/Helper/UserHelper.php')
| -rw-r--r-- | app/Helper/UserHelper.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/Helper/UserHelper.php b/app/Helper/UserHelper.php index ab259a62..e42bafe4 100644 --- a/app/Helper/UserHelper.php +++ b/app/Helper/UserHelper.php @@ -50,7 +50,8 @@ class UserHelper extends Base */ public function getFullname(array $user = array()) { - return $this->userModel->getFullname(empty($user) ? $this->userSession->getAll() : $user); + $user = empty($user) ? $this->userSession->getAll() : $user; + return $user['name'] ?: $user['username']; } /** |