diff options
| author | marijus <mario@localhost.localdomain> | 2014-01-30 10:15:36 +0100 |
|---|---|---|
| committer | marijus <mario@localhost.localdomain> | 2014-01-30 10:15:36 +0100 |
| commit | 3d43553b2043b235730f1add9d680a96bc9d8530 (patch) | |
| tree | 3e723662de15092ab666ab412526ac0e17e150f7 /include/chat.php | |
| parent | 91e9e3be91e9fd6ba73085066d34a4c6daf27ee9 (diff) | |
| parent | 6c6a9b963a925d33b2cc436d877a4edc5f0d59b1 (diff) | |
| download | volse-hubzilla-3d43553b2043b235730f1add9d680a96bc9d8530.tar.gz volse-hubzilla-3d43553b2043b235730f1add9d680a96bc9d8530.tar.bz2 volse-hubzilla-3d43553b2043b235730f1add9d680a96bc9d8530.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'include/chat.php')
| -rw-r--r-- | include/chat.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/chat.php b/include/chat.php index aef154fe6..b88c63fc3 100644 --- a/include/chat.php +++ b/include/chat.php @@ -155,7 +155,7 @@ function chatroom_leave($observer_xchan,$room_id,$client) { function chatroom_list($uid) { - $r = q("select cr_name, cr_id, count(cp_id) as cr_inroom from chatroom left join chatpresence on cr_id = cp_room where cr_uid = %d group by cp_id order by cr_name", + $r = q("select cr_name, cr_id, count(cp_id) as cr_inroom from chatroom left join chatpresence on cr_id = cp_room where cr_uid = %d group by cr_name order by cr_name", intval($uid) ); |