Merge branch 'master' into kevin-prototype

2017-01-25 15:08:34 +01:00
parent 9ff256429d c23b8bd8e5
commit 95570c49d4
21 changed files with 253 additions and 54 deletions
--- a/website/public/profile.php
+++ b/website/public/profile.php
@@ -15,7 +15,6 @@ include("../queries/nicetime.php");

 if(empty($_GET["username"])) {
    $userID = $_SESSION["userID"];
-    echo "USERNAME NOT GIVEN";
 } else {
    $userID = getUserID($_GET["username"]);
 }