MyHyvesBookPlus/WebDB
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Merge branch 'kevin-prototype' into 'master'

Browse Source 
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
parent 3752f3cd33 1cfcba80fc
commit 1db998c1bd
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
website/public/profile.php
View File

@@ -42,12 +42,11 @@ 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);
$profile_groups = selectAllUserGroups($userID); $profile_groups = selectAllUserGroups($userID);

1
website/queries/user.php
View File

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