diff options
| author | friendica <info@friendica.com> | 2014-02-25 19:48:57 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-02-25 19:48:57 -0800 |
| commit | 3fb26e06ab98d9eceb1450dbb519225203ed36ef (patch) | |
| tree | a57d32f672b52ecdca1b87a2ef5d9343e708f3b9 /mod/chatsvc.php | |
| parent | e7e97e578b3069b8d24ea2a18ce4d3648b402ca3 (diff) | |
| parent | c1f3c892b004eacb269fdc914d90792fa99f4d1a (diff) | |
| download | volse-hubzilla-3fb26e06ab98d9eceb1450dbb519225203ed36ef.tar.gz volse-hubzilla-3fb26e06ab98d9eceb1450dbb519225203ed36ef.tar.bz2 volse-hubzilla-3fb26e06ab98d9eceb1450dbb519225203ed36ef.zip | |
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'mod/chatsvc.php')
| -rw-r--r-- | mod/chatsvc.php | 4 |
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 + |