harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sql error

Browse Source
This commit is contained in:
friendica 2014-07-29 18:34:24 -07:00
parent ca5992fade
commit a1ffb5ee72
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/chat.php
View File

@ -119,10 +119,10 @@ function chatroom_enter($observer_xchan,$room_id,$status,$client) {
$limit = service_class_fetch($r[0]['cr_uid'],'chatters_inroom'); $limit = service_class_fetch($r[0]['cr_uid'],'chatters_inroom');
if($limit !== false) { 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) intval($room_id)
); );
if($x && $x[0]['total'] > $limit) { if($y && $y[0]['total'] > $limit) {
notice( t('Room is full') . EOL); notice( t('Room is full') . EOL);
return false; return false;
} }
@ -235,6 +235,8 @@ function chat_message($uid,$room_id,$xchan,$text) {
*/ */
function chatroom_flush($room_id,$xchan) { function chatroom_flush($room_id,$xchan) {
$date_limit = date('Y-m-d H:i:s', time() - 3600 * MAX_CHATROOM_HOURS); $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'", $d = q("delete from chat where chat_room = %d and chat_xchan = '%s' and created < '%s'",
intval($room_id), intval($room_id),

2
include/contact_widgets.php
View File

@ -79,7 +79,7 @@ function categories_widget($baseurl,$selected = '') {
and term.uid = item.uid and term.uid = item.uid
and term.type = %d and term.type = %d
and item.author_xchan = '%s' and item.author_xchan = '%s'
and item.restrict = 0 and item.item_restrict = 0
order by term.term asc", order by term.term asc",
intval($a->profile['profile_uid']), intval($a->profile['profile_uid']),
intval(TERM_CATEGORY), intval(TERM_CATEGORY),

2
version.inc
View File

@ -1 +1 @@
2014-07-28.750 2014-07-29.751