diff options
| author | friendica <info@friendica.com> | 2015-01-28 21:11:07 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-28 21:11:07 -0800 |
| commit | b9a760783d9e82650db7f9dbfd1e0e8ab678f2d6 (patch) | |
| tree | 75a839964f63227b84c86707dc25611d9f5be44f /include/chat.php | |
| parent | 74f9544ed40b4d6110846d87fec16ca4102fca13 (diff) | |
| parent | 2039710962db42e0b85a1ab452f923b921bce1b4 (diff) | |
| download | volse-hubzilla-b9a760783d9e82650db7f9dbfd1e0e8ab678f2d6.tar.gz volse-hubzilla-b9a760783d9e82650db7f9dbfd1e0e8ab678f2d6.tar.bz2 volse-hubzilla-b9a760783d9e82650db7f9dbfd1e0e8ab678f2d6.zip | |
Merge https://github.com/friendica/red into pending_merge
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 533c03dde..b19d495bb 100644 --- a/include/chat.php +++ b/include/chat.php @@ -185,7 +185,7 @@ function chatroom_list($uid) { require_once('include/security.php'); $sql_extra = permissions_sql($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 $sql_extra group by cr_name 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 $sql_extra group by cr_name, cr_id order by cr_name", intval($uid) ); |