Merge branch 'master' into lars

This commit is contained in:
Lars van Hijfte
2017-01-24 17:07:07 +01:00
3 changed files with 16 additions and 12 deletions

View File

@@ -20,8 +20,6 @@ if(empty($_GET["username"])) {
$userID = getUserID($_GET["username"]);
}
echo "User ID: $userID";
$user = selectUser($_SESSION["userID"], $userID);
$profile_friends = selectAllFriends($userID);
$profile_groups = selectAllUserGroups($userID);