diff options
| author | redmatrix <git@macgirvin.com> | 2016-04-03 16:16:14 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-04-03 16:16:14 -0700 |
| commit | b4c1baada1fba46d4d75f40a7e78111d70d54e7a (patch) | |
| tree | 0dcf211c433479409a2ea932d1c0ca6bc463562d /include | |
| parent | 1ca3eeedffe4fb443a19b4b84e16a73522990334 (diff) | |
| parent | f13096a6f3b26d9e88dc0d6c07c63a1d5f75346e (diff) | |
| download | volse-hubzilla-b4c1baada1fba46d4d75f40a7e78111d70d54e7a.tar.gz volse-hubzilla-b4c1baada1fba46d4d75f40a7e78111d70d54e7a.tar.bz2 volse-hubzilla-b4c1baada1fba46d4d75f40a7e78111d70d54e7a.zip | |
Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge
Diffstat (limited to 'include')
| -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 8a5970cca..604402045 100644 --- a/include/chat.php +++ b/include/chat.php @@ -202,7 +202,7 @@ function chatroom_list($uid) { require_once('include/security.php'); $sql_extra = permissions_sql($uid); - $r = q("select allow_cid, allow_gid, deny_cid, deny_gid, 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", + $r = q("select allow_cid, allow_gid, deny_cid, deny_gid, cr_name, cr_expire, 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) ); |