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

Merge branch 'patch-20190212a' into 'dev'

Browse Source 
Fix: only first lock red with privacy_warning

See merge request hubzilla/core!1510
This commit is contained in:
Mario 2019-02-13 20:36:33 +01:00
commit 7b8eb84cb8
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Zotlabs/Lib/ThreadItem.php
View File

@ -76,7 +76,7 @@ class ThreadItem {
* _ false on failure * _ false on failure
*/ */
public function get_template_data($conv_responses, $thread_level=1) { public function get_template_data($conv_responses, $thread_level=1, $conv_flags = []) {
$result = array(); $result = array();
@ -117,11 +117,14 @@ class ThreadItem {
} }
if ($lock) { if ($lock) {
if (count(get_terms_oftype($item['term'],TERM_FORUM))) { if (($item['mid'] == $item['parent_mid']) && count(get_terms_oftype($item['term'],TERM_FORUM))) {
$privacy_warning = true; $privacy_warning = true;
$conv_flags['parent_privacy_warning'] = true;
} }
} }
$privacy_warning = (isset($conv_flags['parent_privacy_warning'])) ? $conv_flags['parent_privacy_warning'] : $privacy_warning;
if ($lock && $privacy_warning) { if ($lock && $privacy_warning) {
$lock = t('Privacy conflict. Discretion advised.'); $lock = t('Privacy conflict. Discretion advised.');
} }
@ -488,7 +491,7 @@ class ThreadItem {
if(($this->get_display_mode() === 'normal') && ($nb_children > 0)) { if(($this->get_display_mode() === 'normal') && ($nb_children > 0)) {
foreach($children as $child) { foreach($children as $child) {
$result['children'][] = $child->get_template_data($conv_responses, $thread_level + 1); $result['children'][] = $child->get_template_data($conv_responses, $thread_level + 1,$conv_flags);
} }
// Collapse // Collapse
if(($nb_children > $visible_comments) || ($thread_level > 1)) { if(($nb_children > $visible_comments) || ($thread_level > 1)) {