Merge branch 'master' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB

2017-01-19 16:04:07 +01:00
parent f535bb10ca 7792ceaeeb
commit 56b17675fa
33 changed files with 530 additions and 555 deletions
--- a/website/queries/friendship.php
+++ b/website/queries/friendship.php
@@ -1,9 +1,9 @@
 <?php
-require("connect.php");

 function selectAllFriends($userID) {
    $stmt = $GLOBALS["db"]->prepare("
        SELECT
+            `userID`,
            `username`,
            IFNULL(
                `profilepicture`,