summaryrefslogtreecommitdiff
path: root/includes/controller
diff options
context:
space:
mode:
authormsquare <msquare@notrademark.de>2017-12-27 12:24:55 +0100
committermsquare <msquare@notrademark.de>2017-12-27 12:24:55 +0100
commit1e8f0c484588882e01bc173f7f60e2cf1376f790 (patch)
tree92a039f8449c55109e4e1832deef4fe56177ae4d /includes/controller
parentabf4b1da30e7fabebfa5e36cfc5c1fe691320a1e (diff)
fixes #208, fixes #310: T-Shirt Score™ should be shown on the user view page below your shifts
Diffstat (limited to 'includes/controller')
-rw-r--r--includes/controller/users_controller.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/includes/controller/users_controller.php b/includes/controller/users_controller.php
index e206176f..ae297851 100644
--- a/includes/controller/users_controller.php
+++ b/includes/controller/users_controller.php
@@ -220,7 +220,7 @@ function user_controller()
);
}
}
-
+
if ($user_source['api_key'] == '') {
User_reset_api_key($user_source, false);
}
@@ -234,7 +234,9 @@ function user_controller()
User_angeltypes($user_source),
User_groups($user_source),
$shifts,
- $user['UID'] == $user_source['UID']
+ $user['UID'] == $user_source['UID'],
+ User_tshirt_score($user_source),
+ in_array('admin_active', $privileges)
)
];
}