diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-20 14:33:15 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-20 14:33:15 -0400 |
| commit | 18d4cf05833574173f1645e40e68f2c9c775517e (patch) | |
| tree | 3eefeaf641e91416fa7b43b9a36b829f28ff1983 /mod/item.php | |
| parent | f48de791813a914d7ce2e1ec00ba041657f3f8ac (diff) | |
| parent | f16a1199408d167bbc7c52dc408ef02b36808317 (diff) | |
| download | volse-hubzilla-18d4cf05833574173f1645e40e68f2c9c775517e.tar.gz volse-hubzilla-18d4cf05833574173f1645e40e68f2c9c775517e.tar.bz2 volse-hubzilla-18d4cf05833574173f1645e40e68f2c9c775517e.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
search with leading @ performs directory search (# for tag search), nothing for text search
Darkzero-NS + 'Friendicaland' countries.
set comment permissions explicitly to parent permissions
* master:
Diffstat (limited to 'mod/item.php')
| -rw-r--r-- | mod/item.php | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/mod/item.php b/mod/item.php index 639379fe0..9f6b2aef4 100644 --- a/mod/item.php +++ b/mod/item.php @@ -218,14 +218,23 @@ function item_post(&$a) { $private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0); - if(($parent_item) && - (($parent_item['private']) + // If this is a comment, set the permissions from the parent. + + if($parent_item) { + $private = 0; + + if(($parent_item['private']) || strlen($parent_item['allow_cid']) || strlen($parent_item['allow_gid']) || strlen($parent_item['deny_cid']) - || strlen($parent_item['deny_gid']) - )) { - $private = 1; + || strlen($parent_item['deny_gid'])) { + $private = 1; + } + + $str_contact_allow = $parent_item['allow_cid']; + $str_group_allow = $parent_item['allow_gid']; + $str_contact_deny = $parent_item['deny_cid']; + $str_group_deny = $parent_item['deny_gid']; } $pubmail_enable = ((x($_REQUEST,'pubmail_enable') && intval($_REQUEST['pubmail_enable']) && (! $private)) ? 1 : 0); |