diff options
| author | friendica <info@friendica.com> | 2014-07-29 18:34:24 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-07-29 18:34:24 -0700 |
| commit | a1ffb5ee724e6879f3b24708d70b808c4438e2fc (patch) | |
| tree | f0d177959dcef581095b83d7e19cb9de4ce940f5 | |
| parent | ca5992fade670fd1270c5be1af8fe4bdb6a85dd5 (diff) | |
| download | volse-hubzilla-a1ffb5ee724e6879f3b24708d70b808c4438e2fc.tar.gz volse-hubzilla-a1ffb5ee724e6879f3b24708d70b808c4438e2fc.tar.bz2 volse-hubzilla-a1ffb5ee724e6879f3b24708d70b808c4438e2fc.zip | |
sql error
| -rw-r--r-- | include/chat.php | 6 | ||||
| -rw-r--r-- | include/contact_widgets.php | 2 | ||||
| -rw-r--r-- | version.inc | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/include/chat.php b/include/chat.php index 9d2341dfa..5f69853e7 100644 --- a/include/chat.php +++ b/include/chat.php @@ -119,10 +119,10 @@ function chatroom_enter($observer_xchan,$room_id,$status,$client) { $limit = service_class_fetch($r[0]['cr_uid'],'chatters_inroom'); if($limit !== false) { - $x = q("select count(*) as total from chatpresence where cp_room = %d", + $y = q("select count(*) as total from chatpresence where cp_room = %d", intval($room_id) ); - if($x && $x[0]['total'] > $limit) { + if($y && $y[0]['total'] > $limit) { notice( t('Room is full') . EOL); return false; } @@ -235,6 +235,8 @@ function chat_message($uid,$room_id,$xchan,$text) { */ function chatroom_flush($room_id,$xchan) { + + $date_limit = date('Y-m-d H:i:s', time() - 3600 * MAX_CHATROOM_HOURS); $d = q("delete from chat where chat_room = %d and chat_xchan = '%s' and created < '%s'", intval($room_id), diff --git a/include/contact_widgets.php b/include/contact_widgets.php index bccf8b4ae..28a9fcfd3 100644 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -79,7 +79,7 @@ function categories_widget($baseurl,$selected = '') { and term.uid = item.uid and term.type = %d and item.author_xchan = '%s' - and item.restrict = 0 + and item.item_restrict = 0 order by term.term asc", intval($a->profile['profile_uid']), intval(TERM_CATEGORY), diff --git a/version.inc b/version.inc index e5da5dcfe..647793774 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-07-28.750 +2014-07-29.751 |