Merge branch 'master' into lars-algemeen

This commit is contained in:
Lars van Hijfte
2017-01-20 12:48:22 +01:00
2 changed files with 4 additions and 4 deletions

View File

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

View File

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