Merge branch 'kevin-prototype' into 'master'

FIXED VISIBILITY ON PROFILE See merge request !183
2017-02-02 13:57:44 +01:00
parent 3abaeba52c 328ce69144
commit 5c1b2d1b21
6 changed files with 24 additions and 9 deletions
--- a/website/queries/group_page.php
+++ b/website/queries/group_page.php
@@ -81,7 +81,10 @@ function selectGroupMembers(int $groupID) {
          `username`,
          `fname`,
          `lname`,
-          `profilepicture`
+          IFNULL(
+                `profilepicture`,
+                '../img/avatar-standard.png'
+            ) AS profilepicture
        FROM
          `group_member`
        LEFT JOIN
--- a/website/queries/user.php
+++ b/website/queries/user.php
@@ -69,6 +69,10 @@ function selectUser($me, $other) {
          `role`,
          `fname`,
          `lname`,
+          `showBday`,
+          `showEmail`,
+          `showProfile`,
+          `status`,
          CASE `status` IS NULL
            WHEN TRUE THEN 0
            WHEN FALSE THEN