Marijn button #99

Merged
11166932 merged 152 commits from marijn-button into master 2017-01-23 13:25:08 +01:00
2 changed files with 6 additions and 5 deletions
Showing only changes of commit b37d06e2cc - Show all commits

View File

@@ -2,12 +2,12 @@
require("connect.php");
function selectAllFriends($db, $userID) {
$stmt = $db->prepare("
$stmt = $GLOBALS["db"]->prepare("
SELECT
`username`,
IFNULL(
`profilepicture`,
'img/notbad.png'
'../img/notbad.jpg'
) AS profilepicture,
`onlinestatus`,
`role`
@@ -26,5 +26,6 @@ function selectAllFriends($db, $userID) {
$stmt->bindParam(':userID', $userID, PDO::PARAM_INT);
$stmt->execute();
return $stmt;
}

View File

@@ -22,7 +22,7 @@ function selectUser($db, $userID) {
`username`,
IFNULL(
`profilepicture`,
'img/notbad.png'
'../img/notbad.jpg'
) AS profilepicture,
`bio`,
`role`,
@@ -42,7 +42,7 @@ function selectUser($db, $userID) {
}
function selectAllUserGroups($db, $userID) {
$stmt = $db->prepare("
$stmt = $GLOBALS["db"]->prepare("
SELECT
`group_page`.`groupID`,
`name`,
@@ -65,7 +65,7 @@ function selectAllUserGroups($db, $userID) {
}
function selectAllUserPosts($db, $userID) {
$stmt = $db->prepare("
$stmt = $GLOBALS["db"]->prepare("
SELECT
`postID`,
`author`,