slight hack to improve public forum detection in the forum widget
This commit is contained in:
parent
4cd6e7ec91
commit
4af339da63
@ -49,6 +49,7 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto='
|
|||||||
|
|
||||||
// look for any existing conversation structure
|
// look for any existing conversation structure
|
||||||
|
|
||||||
|
|
||||||
if(strlen($replyto)) {
|
if(strlen($replyto)) {
|
||||||
$r = q("select convid from mail where channel_id = %d and ( mid = '%s' or parent_mid = '%s' ) limit 1",
|
$r = q("select convid from mail where channel_id = %d and ( mid = '%s' or parent_mid = '%s' ) limit 1",
|
||||||
intval(local_channel()),
|
intval(local_channel()),
|
||||||
|
@ -1007,7 +1007,9 @@ function widget_forums($arr) {
|
|||||||
|
|
||||||
$perms_sql = item_permissions_sql(local_channel()) . item_normal();
|
$perms_sql = item_permissions_sql(local_channel()) . item_normal();
|
||||||
|
|
||||||
$r1 = q("select * from abook left join xchan on abook_xchan = xchan_hash where xchan_pubforum = 1 and abook_channel = %d order by xchan_name $limit ",
|
$r1 = q("select * from abook left join xchan on abook_xchan = xchan_hash where ( xchan_pubforum = 1 or ((abook_their_perms & %d ) != 0 and (abook_their_perms & %d ) = 0) ) and abook_channel = %d order by xchan_name $limit ",
|
||||||
|
intval(PERMS_W_TAGWALL),
|
||||||
|
intval(PERMS_W_STREAM),
|
||||||
intval(local_channel())
|
intval(local_channel())
|
||||||
);
|
);
|
||||||
if(! $r1)
|
if(! $r1)
|
||||||
|
Reference in New Issue
Block a user