diff options
| author | friendica <info@friendica.com> | 2014-08-06 21:16:24 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-08-06 21:16:24 -0700 |
| commit | 2cff122d6ffcd47e42593d22c1c8d19f45ee91ef (patch) | |
| tree | a1607f94448ba93586a84c347dd52f226b58eba5 /include/items.php | |
| parent | 86bccf35a24019830fc54ac781f985d9add6eddf (diff) | |
| download | volse-hubzilla-2cff122d6ffcd47e42593d22c1c8d19f45ee91ef.tar.gz volse-hubzilla-2cff122d6ffcd47e42593d22c1c8d19f45ee91ef.tar.bz2 volse-hubzilla-2cff122d6ffcd47e42593d22c1c8d19f45ee91ef.zip | |
public scope delivery issues
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php index aa3679e25..08c814e10 100755 --- a/include/items.php +++ b/include/items.php @@ -903,8 +903,7 @@ function encode_item($item) { if($y = encode_item_flags($item)) $x['flags'] = $y; - if($scope != 'public') - $x['public_scope'] = $scope; + $x['public_scope'] = $scope; if($item['item_flags'] & ITEM_NOCOMMENT) $x['comment_scope'] = 'none'; @@ -2453,6 +2452,8 @@ function tag_deliver($uid,$item_id) { $private = (($u[0]['channel_allow_cid'] || $u[0]['channel_allow_gid'] || $u[0]['channel_deny_cid'] || $u[0]['channel_deny_gid']) ? 1 : 0); +//FIXME - add check for public_policy + $flag_bits = ITEM_WALL|ITEM_ORIGIN; // maintain the original source, which will be the original item owner and was stored in source_xchan @@ -2593,6 +2594,8 @@ function tag_deliver($uid,$item_id) { $private = (($u[0]['channel_allow_cid'] || $u[0]['channel_allow_gid'] || $u[0]['channel_deny_cid'] || $u[0]['channel_deny_gid']) ? 1 : 0); +// FIXME set public_policy and recheck private + $flag_bits = ITEM_WALL|ITEM_ORIGIN|ITEM_UPLINK; // preserve the source |