aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-09-03 18:14:17 +0200
committerMario Vavti <mario@mariovavti.com>2018-09-03 18:14:17 +0200
commit41ccb61c2e2f2123ae510a39ebd048a56832825e (patch)
treeca206db744505a143dc11c7a51939ade561e1577 /include
parent1b7781a1597b0c9ce49eaae3b9dd27bed7f3f7ed (diff)
downloadvolse-hubzilla-41ccb61c2e2f2123ae510a39ebd048a56832825e.tar.gz
volse-hubzilla-41ccb61c2e2f2123ae510a39ebd048a56832825e.tar.bz2
volse-hubzilla-41ccb61c2e2f2123ae510a39ebd048a56832825e.zip
Revert "Fix: Authors unable to comment on posts they authored when under owned by others in certain circumstances."
This reverts commit e2824f925964fbfe160255de6e733b4c2de3cecb. Reverting because it breaks forum mentions.
Diffstat (limited to 'include')
-rw-r--r--include/zot.php17
1 files changed, 2 insertions, 15 deletions
diff --git a/include/zot.php b/include/zot.php
index 3523dd2ec..52102e147 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1808,21 +1808,8 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
else {
$arr['item_wall'] = 0;
}
-
- $allowed = (perm_is_allowed($channel['channel_id'],$sender['hash'],$perm) && (! $tag_delivery) && (! $local_public));
-
- if(! $allowed && $perm == 'post_comments') {
-logger("Channel = ".intval($channel['channel_id']));
- $parent = q("select * from item where mid = '%s' and uid = %d limit 1",
- dbesc($arr['parent_mid']),
- intval($channel['channel_id'])
- );
- if ($parent) {
- $allowed = can_comment_on_post($d['hash'],$parent[0]);
- }
- }
-
- if (! $allowed) {
+
+ if((! perm_is_allowed($channel['channel_id'],$sender['hash'],$perm)) && (! $tag_delivery) && (! $local_public)) {
logger("permission denied for delivery to channel {$channel['channel_id']} {$channel['channel_address']}");
$DR->update('permission denied');
$result[] = $DR->get();