From be22f0619e25b15c8c3d002cf1f190aa9976bc71 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 24 Jul 2016 13:29:24 -0400
Subject: Remove method UserModel::getFullname()

---
 app/Helper/UserHelper.php |  3 ++-
 app/Model/UserModel.php   | 13 +------------
 2 files changed, 3 insertions(+), 13 deletions(-)

(limited to 'app')

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'];
     }
 
     /**
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
@@ -64,17 +64,6 @@ class UserModel extends Base
         return $this->db->table(self::TABLE);
     }
 
-    /**
-     * 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
      *
@@ -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);
-- 
cgit v1.2.3