From 210f6c8182585af0448fac49fa6d017c113db33b Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Wed, 17 Sep 2014 17:32:01 +0200
Subject: Improve labels in change password interface (pull-request #270)

---
 app/helpers.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'app/helpers.php')

diff --git a/app/helpers.php b/app/helpers.php
index 85a2507d..3586c3b3 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -35,9 +35,10 @@ function is_admin()
     return $_SESSION['user']['is_admin'] == 1;
 }
 
-function get_username()
+function get_username($user = false)
 {
-    return $_SESSION['user']['name'] ?: $_SESSION['user']['username'];
+    return $user ? ($user['name'] ?: $user['username'])
+                : ($_SESSION['user']['name'] ?: $_SESSION['user']['username']);
 }
 
 function get_user_id()
-- 
cgit v1.2.3