diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-08-12 22:37:24 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-08-12 22:37:24 -0700 |
| commit | 0b7365e2db5fea2f2aaa312087caeeb495d0e289 (patch) | |
| tree | a95c6f3a8bf910d86babdda05207abd5d9ba08f7 | |
| parent | d882b3274bd3b2479b924683b75b03c7854ad453 (diff) | |
| download | volse-hubzilla-0b7365e2db5fea2f2aaa312087caeeb495d0e289.tar.gz volse-hubzilla-0b7365e2db5fea2f2aaa312087caeeb495d0e289.tar.bz2 volse-hubzilla-0b7365e2db5fea2f2aaa312087caeeb495d0e289.zip | |
revert 36b5f6ac
| -rw-r--r-- | include/zot.php | 26 | ||||
| -rw-r--r-- | version.inc | 2 |
2 files changed, 15 insertions, 13 deletions
diff --git a/include/zot.php b/include/zot.php index b88bf72c3..17554a490 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1560,18 +1560,20 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $ $tag_delivery = tgroup_check($channel['channel_id'],$arr); - if ($arr['mid'] == $arr['parent_mid']){ - $perm = 'send_stream'; - } - else{ - $r = q("select item_owner from item where item.mid == '%s' limit 1", - dbesc($arr['parent_mid'])); - if($channel['channel_hash'] == $r[0]['item_owner']) - $perm = 'post_comments'; - else - $perm = 'send_stream'; - } - + $perm = (($arr['mid'] == $arr['parent_mid']) ? 'send_stream' : 'post_comments'); + +// if ($arr['mid'] == $arr['parent_mid']){ +// $perm = 'send_stream'; +// } +// else{ +// $r = q("select item_owner from item where item.mid = '%s' limit 1", +// dbesc($arr['parent_mid'])); +// if($channel['channel_hash'] == $r[0]['item_owner']) +// $perm = 'post_comments'; +// else +// $perm = 'send_stream'; +// } +// // This is our own post, possibly coming from a channel clone diff --git a/version.inc b/version.inc index 3eb040d29..730c6d9c6 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-08-11.1121 +2015-08-12.1122 |