aboutsummaryrefslogtreecommitdiffstats
path: root/include/zot.php
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2018-09-02 09:17:29 +0200
committerMario <mario@mariovavti.com>2018-09-02 09:17:29 +0200
commit1b7781a1597b0c9ce49eaae3b9dd27bed7f3f7ed (patch)
tree512c014e48e6be489689c8598c061ce8ae31647e /include/zot.php
parentd66f58a550d61f17c46eca42cba84f45ae9c4628 (diff)
parente2824f925964fbfe160255de6e733b4c2de3cecb (diff)
downloadvolse-hubzilla-1b7781a1597b0c9ce49eaae3b9dd27bed7f3f7ed.tar.gz
volse-hubzilla-1b7781a1597b0c9ce49eaae3b9dd27bed7f3f7ed.tar.bz2
volse-hubzilla-1b7781a1597b0c9ce49eaae3b9dd27bed7f3f7ed.zip
Merge branch 'add-delivery-status-info' into 'dev'
Fix: Authors unable to comment on posts they authored when under owned by others… See merge request hubzilla/core!1268
Diffstat (limited to 'include/zot.php')
-rw-r--r--include/zot.php17
1 files changed, 15 insertions, 2 deletions
diff --git a/include/zot.php b/include/zot.php
index 52102e147..3523dd2ec 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1808,8 +1808,21 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
else {
$arr['item_wall'] = 0;
}
-
- if((! perm_is_allowed($channel['channel_id'],$sender['hash'],$perm)) && (! $tag_delivery) && (! $local_public)) {
+
+ $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) {
logger("permission denied for delivery to channel {$channel['channel_id']} {$channel['channel_address']}");
$DR->update('permission denied');
$result[] = $DR->get();