harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert 36b5f6ac

Browse Source
This commit is contained in:
redmatrix 2015-08-12 22:37:24 -07:00
parent d882b3274b
commit 0b7365e2db
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/zot.php
View File

@ -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

2
version.inc
View File

@ -1 +1 @@
2015-08-11.1121
2015-08-12.1122