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/friendship.php
+++ b/website/queries/friendship.php
@@ -29,6 +29,12 @@ function selectLimitedFriends($userID, $limit) {
            `friendship`.`user1ID` = `user`.`userID`) AND
            `user`.`role` != 'banned' AND
            `friendship`.`status` = 'confirmed'
+        ORDER BY 
+            CASE
+            WHEN `friendship`.`user2ID` = `user`.`userID` THEN `friendship`.`chatLastVisted1`
+            WHEN `friendship`.`user1ID` = `user`.`userID` THEN `friendship`.`chatLastVisted2`
+            END
+            DESC
        LIMIT :limitCount
    ");