aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-02-26 13:04:16 +1100
committerfriendica <info@friendica.com>2014-02-26 13:04:16 +1100
commitc1f3c892b004eacb269fdc914d90792fa99f4d1a (patch)
tree3873caeec1e1c31221e50508ea0a4b5e9f9093a5 /mod
parent2c72e49d1f63404b464f284d86ce2dce7f2eb493 (diff)
parent04e6cb515b524b35ae9f8d20c4b131aa0429a784 (diff)
downloadvolse-hubzilla-c1f3c892b004eacb269fdc914d90792fa99f4d1a.tar.gz
volse-hubzilla-c1f3c892b004eacb269fdc914d90792fa99f4d1a.tar.bz2
volse-hubzilla-c1f3c892b004eacb269fdc914d90792fa99f4d1a.zip
Merge pull request #340 from beardy-unixer/master
Fix the weirdness of messages appearing in the middle of the screen
Diffstat (limited to 'mod')
-rw-r--r--mod/chatsvc.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/mod/chatsvc.php b/mod/chatsvc.php
index e6590f57a..9cc8778f5 100644
--- a/mod/chatsvc.php
+++ b/mod/chatsvc.php
@@ -113,7 +113,7 @@ function chatsvc_content(&$a) {
$chats = array();
- $r = q("select * from chat left join xchan on chat_xchan = xchan_hash where chat_room = %d and chat_id > %d",
+ $r = q("select * from chat left join xchan on chat_xchan = xchan_hash where chat_room = %d and chat_id > %d order by created",
intval($a->data['chat']['room_id']),
intval($lastseen)
);
@@ -147,4 +147,4 @@ function chatsvc_content(&$a) {
json_return_and_die($ret);
}
- \ No newline at end of file
+