Improve labels in change password interface (pull-request #270)

2014-09-17 17:32:01 +02:00
parent a5b90a9404
commit 210f6c8182
12 changed files with 68 additions and 3 deletions
--- 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()