diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-08-14 22:20:44 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-08-14 22:20:44 -0700 |
| commit | 1d4dc7e27c6ca88110cdba0297c31bdb12079cbf (patch) | |
| tree | 69b017f6bb8d1fc34912752040b7bf7105fc8149 /include/zot.php | |
| parent | 0d84c77c6c09f1e73e1ce1c5516ccf881b1dcdde (diff) | |
| parent | 400eb748eb1e26188a9f113cec9384f822166512 (diff) | |
| download | volse-hubzilla-1d4dc7e27c6ca88110cdba0297c31bdb12079cbf.tar.gz volse-hubzilla-1d4dc7e27c6ca88110cdba0297c31bdb12079cbf.tar.bz2 volse-hubzilla-1d4dc7e27c6ca88110cdba0297c31bdb12079cbf.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/include/zot.php b/include/zot.php index 17554a490..19bacfa4f 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1560,20 +1560,9 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $ $tag_delivery = tgroup_check($channel['channel_id'],$arr); - $perm = (($arr['mid'] == $arr['parent_mid']) ? 'send_stream' : 'post_comments'); - -// if ($arr['mid'] == $arr['parent_mid']){ -// $perm = 'send_stream'; -// } -// else{ -// $r = q("select item_owner from item where item.mid = '%s' limit 1", -// dbesc($arr['parent_mid'])); -// if($channel['channel_hash'] == $r[0]['item_owner']) -// $perm = 'post_comments'; -// else -// $perm = 'send_stream'; -// } -// + $perm = 'send_stream'; + if(($arr['mid'] !== $arr['parent_mid']) && ($relay)) + $perm = 'post_comments'; // This is our own post, possibly coming from a channel clone |