diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-09-09 18:18:27 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-09 18:18:27 -0700 |
| commit | 4af339da636e70b2695c12881f5dbc086e55a656 (patch) | |
| tree | adec116ba194fa2f72679dddf36d0735dbf30144 | |
| parent | 4cd6e7ec9158fea96c3741843f6f26a8bad8c18f (diff) | |
| download | volse-hubzilla-4af339da636e70b2695c12881f5dbc086e55a656.tar.gz volse-hubzilla-4af339da636e70b2695c12881f5dbc086e55a656.tar.bz2 volse-hubzilla-4af339da636e70b2695c12881f5dbc086e55a656.zip | |
slight hack to improve public forum detection in the forum widget
| -rw-r--r-- | include/message.php | 1 | ||||
| -rw-r--r-- | include/widgets.php | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/message.php b/include/message.php index 396e3162c..efe1a7710 100644 --- a/include/message.php +++ b/include/message.php @@ -49,6 +49,7 @@ function send_message($uid = 0, $recipient='', $body='', $subject='', $replyto=' // look for any existing conversation structure + if(strlen($replyto)) { $r = q("select convid from mail where channel_id = %d and ( mid = '%s' or parent_mid = '%s' ) limit 1", intval(local_channel()), diff --git a/include/widgets.php b/include/widgets.php index 8c5e92140..9f7380c87 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -1007,7 +1007,9 @@ function widget_forums($arr) { $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()) ); if(! $r1) |