aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib/ThreadItem.php
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-09-06 19:22:39 +0000
committerMario <mario@mariovavti.com>2021-09-06 19:22:39 +0000
commitc1ce211b566a68b02f1197ef1bd0fc79385c1c48 (patch)
tree81d8b40691e73abcb5e988cd42d11d6a1e396c60 /Zotlabs/Lib/ThreadItem.php
parent3d40ea7f4417a1134dc53cc2e804af13370cd57b (diff)
parent1aa782633184f41733778ce75139f0d9a890e1e3 (diff)
downloadvolse-hubzilla-c1ce211b566a68b02f1197ef1bd0fc79385c1c48.tar.gz
volse-hubzilla-c1ce211b566a68b02f1197ef1bd0fc79385c1c48.tar.bz2
volse-hubzilla-c1ce211b566a68b02f1197ef1bd0fc79385c1c48.zip
Merge branch 'dev' into 6.2RC
Diffstat (limited to 'Zotlabs/Lib/ThreadItem.php')
-rw-r--r--Zotlabs/Lib/ThreadItem.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index c9048cd4f..cd54fea17 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -503,7 +503,7 @@ class ThreadItem {
'wait' => t('Please wait'),
'thread_level' => $thread_level,
'settings' => $settings,
- 'thr_parent' => (($item['parent_mid'] != $item['thr_parent']) ? 'b64.' . base64url_encode($item['thr_parent']) : '')
+ 'thr_parent' => (($item['parent_mid'] != $item['thr_parent']) ? gen_link_id($item['thr_parent']) : '')
);
$arr = array('item' => $item, 'output' => $tmp_item);
@@ -842,7 +842,7 @@ class ThreadItem {
'$cipher' => $conv->get_cipher(),
'$sourceapp' => \App::$sourcename,
'$observer' => get_observer_hash(),
- '$anoncomments' => ((($conv->get_mode() === 'channel' || $conv->get_mode() === 'display') && perm_is_allowed($conv->get_profile_owner(),'','post_comments')) ? true : false),
+ '$anoncomments' => ((in_array($conv->get_mode(), ['channel', 'display', 'cards', 'articles']) && perm_is_allowed($conv->get_profile_owner(),'','post_comments')) ? true : false),
'$anonname' => [ 'anonname', t('Your full name (required)') ],
'$anonmail' => [ 'anonmail', t('Your email address (required)') ],
'$anonurl' => [ 'anonurl', t('Your website URL (optional)') ]