Merge branch 'hendrik-post' into 'master'

Hendrik post See merge request !122
2017-01-25 16:20:48 +01:00
parent f7bf80d789 f06de1e88d
commit e1ca3c52ed
11 changed files with 303 additions and 7 deletions
--- a/website/queries/user.php
+++ b/website/queries/user.php
@@ -321,7 +321,10 @@ function searchSomeUsers($n, $m, $search)
    $stmt = $GLOBALS["db"]->prepare("
    SELECT
        `username`,
-        `profilepicture`,
+        IFNULL(
+            `profilepicture`,
+            '../img/notbad.jpg'
+        ) AS profilepicture,
        `fname`,
        `lname`
    FROM