summaryrefslogtreecommitdiff
path: root/app/helpers.php
diff options
context:
space:
mode:
authorFrédéric Guillot <fred@kanboard.net>2014-09-17 17:32:01 +0200
committerFrédéric Guillot <fred@kanboard.net>2014-09-17 17:32:01 +0200
commit210f6c8182585af0448fac49fa6d017c113db33b (patch)
tree42a6bf7034833454c8a60feb8597545c7f5a5227 /app/helpers.php
parenta5b90a9404b2cfcf6187016bebd01da81ea0b043 (diff)
Improve labels in change password interface (pull-request #270)
Diffstat (limited to 'app/helpers.php')
-rw-r--r--app/helpers.php5
1 files changed, 3 insertions, 2 deletions
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()