Merge branch 'master' into joey-testing

2017-01-20 12:33:39 +01:00
parent eb1fc15401 1db998c1bd
commit cc9ec9d54a
2 changed files with 4 additions and 4 deletions
--- a/website/public/profile.php
+++ b/website/public/profile.php
@@ -42,12 +42,11 @@ function nicetime($date) {
 }

 if(empty($_GET["username"])) {
-    echo "User does not exist!";
-    return;
+    $userID = $_SESSION["userID"];
+} else {
+    $userID = getUserID($_GET["username"]);
 }

-$userID = getUserID($_GET["username"]);
-
 $user = selectUser($userID);
 $profile_friends = selectAllFriends($userID);
 $profile_groups = selectAllUserGroups($userID);