Merge branch 'master' into kevin-prototype

2017-01-26 13:24:16 +01:00
parent 3ebacd6251 423c2fd771
commit cf964ec8d6
45 changed files with 1256 additions and 365 deletions
--- a/website/queries/user.php
+++ b/website/queries/user.php
@@ -323,7 +323,10 @@ function searchSomeUsers($n, $m, $search)
    $stmt = $GLOBALS["db"]->prepare("
    SELECT
        `username`,
-        `profilepicture`,
+        IFNULL(
+            `profilepicture`,
+            '../img/notbad.jpg'
+        ) AS profilepicture,
        `fname`,
        `lname`
    FROM