Merge remote-tracking branch 'upstream/master'

Conflicts:
	app/Job/NotificationJob.php

1 files changed, 1 insertions, 12 deletions

diff --git a/app/Model/UserModel.php b/app/Model/UserModel.php
index f7a051c5..56b1a960 100644
--- a/app/Model/UserModel.php
+++ b/app/Model/UserModel.php
@@ -65,17 +65,6 @@ class UserModel extends Base
     }
 
     /**
-     * Return the full name
-     *
-     * @param  array    $user   User properties
-     * @return string
-     */
-    public function getFullname(array $user)
-    {
-        return $user['name'] ?: $user['username'];
-    }
-
-    /**
      * Return true is the given user id is administrator
      *
      * @access public
@@ -230,7 +219,7 @@ class UserModel extends Base
         $result = array();
 
         foreach ($users as $user) {
-            $result[$user['id']] = $this->getFullname($user);
+            $result[$user['id']] = $this->helper->user->getFullname($user);
         }
 
         asort($result);