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

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();