diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-04-03 11:35:06 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-04-03 11:35:06 +0200 |
| commit | b6f18a9a0b044339e334139284294a246ab245ad (patch) | |
| tree | 069099434667defba70d1fa8ca13bcfc95b6763e /include/chat.php | |
| parent | 2772a7209594bf239200e81e48d997d49dea2daf (diff) | |
| parent | b8d8be701382b72b3556ff9a3d67aabfc85223f5 (diff) | |
| download | volse-hubzilla-b6f18a9a0b044339e334139284294a246ab245ad.tar.gz volse-hubzilla-b6f18a9a0b044339e334139284294a246ab245ad.tar.bz2 volse-hubzilla-b6f18a9a0b044339e334139284294a246ab245ad.zip | |
Merge branch 'master' into dev
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 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) ); |