Merge branch 'lars' into 'master'

Lars See merge request !152
2017-01-30 15:41:32 +01:00
parent bb56679885 b0a8ceafc3
commit 6831994ede
14 changed files with 303 additions and 117 deletions
--- a/website/queries/user.php
+++ b/website/queries/user.php
@@ -46,6 +46,7 @@ function selectUser($me, $other) {
          `bio`,
          `user`.`creationdate`,
          `onlinestatus`,
+          `role`,
          `fname`,
          `lname`,
          CASE `status` IS NULL