diff options
| author | zottel <github@zottel.net> | 2012-05-20 09:08:56 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-05-20 09:08:56 +0200 |
| commit | 2cd3ec7b983327f8c162845d0f4b8d9753f30e27 (patch) | |
| tree | 3eefeaf641e91416fa7b43b9a36b829f28ff1983 /mod/item.php | |
| parent | 764ac240a9a9ffb7c855a69bc2f81e9d314a617f (diff) | |
| parent | f16a1199408d167bbc7c52dc408ef02b36808317 (diff) | |
| download | volse-hubzilla-2cd3ec7b983327f8c162845d0f4b8d9753f30e27.tar.gz volse-hubzilla-2cd3ec7b983327f8c162845d0f4b8d9753f30e27.tar.bz2 volse-hubzilla-2cd3ec7b983327f8c162845d0f4b8d9753f30e27.zip | |
Merge remote branch 'upstream/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); |