Merge branch 'kevin-prototype' into 'master'

Kevin prototype

See merge request !78
This commit was merged in pull request #82.
This commit is contained in:
Marijn Jansen
2017-01-20 12:27:58 +01:00
2 changed files with 4 additions and 4 deletions

View File

@@ -42,11 +42,10 @@ function nicetime($date) {
}
if(empty($_GET["username"])) {
echo "User does not exist!";
return;
}
$userID = $_SESSION["userID"];
} else {
$userID = getUserID($_GET["username"]);
}
$user = selectUser($userID);
$profile_friends = selectAllFriends($userID);

View File

@@ -1,4 +1,5 @@
<?php
require("connect.php");
function getUserID($username) {