Merge branch 'lars' into 'master'

Lars See merge request !152
2017-01-30 15:41:32 +01:00
parent bb56679885 b0a8ceafc3
commit 6831994ede
14 changed files with 303 additions and 117 deletions
--- a/website/queries/private_message.php
+++ b/website/queries/private_message.php
@@ -15,7 +15,7 @@ function getOldChatMessages($user2ID) {
            `origin` = :user2 AND
            `destination` = :user1
        ORDER BY
-            `messageID` ASC
+            `creationdate` ASC
        ");

        $stmt->bindParam(":user1", $user1ID);
@@ -74,7 +74,7 @@ function getNewChatMessages($lastID, $destination) {
            `destination` = :user1) AND
            `messageID` > :lastID
        ORDER BY
-            `messageID` ASC
+            `creationdate` ASC
        ");

        $stmt->bindParam(':user1', $_SESSION["userID"]);