aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorM.Dent <dentm42@dm42.net>2018-09-04 07:54:24 -0400
committerM.Dent <dentm42@dm42.net>2018-09-04 08:14:52 -0400
commit9446e0348efa151ef7d75fa8206bb578633273dd (patch)
treeb7b118f55b22ebb81525d275b9455b064ad97e05 /include
parent41ccb61c2e2f2123ae510a39ebd048a56832825e (diff)
downloadvolse-hubzilla-9446e0348efa151ef7d75fa8206bb578633273dd.tar.gz
volse-hubzilla-9446e0348efa151ef7d75fa8206bb578633273dd.tar.bz2
volse-hubzilla-9446e0348efa151ef7d75fa8206bb578633273dd.zip
Corrected resubmit of fixes to Authors unable to comment on posts they authored when owned by others.
Diffstat (limited to 'include')
-rw-r--r--include/zot.php29
1 files changed, 22 insertions, 7 deletions
diff --git a/include/zot.php b/include/zot.php
index 52102e147..e8ac2df02 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1808,13 +1808,28 @@ 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)) {
- logger("permission denied for delivery to channel {$channel['channel_id']} {$channel['channel_address']}");
- $DR->update('permission denied');
- $result[] = $DR->get();
- continue;
- }
+
+
+ if ((! $tag_delivery) && (! $local_public)) {
+ $allowed = (perm_is_allowed($channel['channel_id'],$sender['hash'],$perm));
+
+ if((! $allowed) && $perm == 'post_comments') {
+ $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();
+ continue;
+ }
+ }
if($arr['mid'] != $arr['parent_mid']) {