aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-08-14 22:24:15 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-08-14 22:24:15 -0700
commit18bc12c21ceb6f8c4c92aefea41afa2c235500a8 (patch)
tree781383a1001f4e33afd9df31d97bd15abbc54271 /include
parentd1406200084b47deefe68637777e0b1851166cfe (diff)
parent1d4dc7e27c6ca88110cdba0297c31bdb12079cbf (diff)
downloadvolse-hubzilla-18bc12c21ceb6f8c4c92aefea41afa2c235500a8.tar.gz
volse-hubzilla-18bc12c21ceb6f8c4c92aefea41afa2c235500a8.tar.bz2
volse-hubzilla-18bc12c21ceb6f8c4c92aefea41afa2c235500a8.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts: include/zot.php util/messages.po
Diffstat (limited to 'include')
-rw-r--r--include/zot.php3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/zot.php b/include/zot.php
index a3e9bbf81..bae20b4f0 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1539,9 +1539,6 @@ 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');
-
$perm = 'send_stream';
if(($arr['mid'] !== $arr['parent_mid']) && ($relay))
$perm = 'post_comments';