diff options
| author | redmatrix <git@macgirvin.com> | 2016-04-03 16:17:31 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-04-03 16:17:31 -0700 |
| commit | cfad5ba8b8baf843ea02bbb5eadd78f3bf845136 (patch) | |
| tree | a0b9c107b2d0121b5268d95e3f3d9bffdc72c9c5 /include | |
| parent | 84feff9500db2b66c977749e0c5b777259031783 (diff) | |
| parent | b4c1baada1fba46d4d75f40a7e78111d70d54e7a (diff) | |
| download | volse-hubzilla-cfad5ba8b8baf843ea02bbb5eadd78f3bf845136.tar.gz volse-hubzilla-cfad5ba8b8baf843ea02bbb5eadd78f3bf845136.tar.bz2 volse-hubzilla-cfad5ba8b8baf843ea02bbb5eadd78f3bf845136.zip | |
Merge branch 'master' into dev
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) ); |