aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-08-21 20:03:25 -0700
committerfriendica <info@friendica.com>2012-08-21 20:03:25 -0700
commit30e86284af3cdf64cf4f5f6a0e1ced04cfb73258 (patch)
tree938d2031d1492d9cbfa6b77382e5aaebba50c8d5 /include/conversation.php
parent9b9f35f8e57464ead49be0a8e2aa64b0d8a6573c (diff)
downloadvolse-hubzilla-30e86284af3cdf64cf4f5f6a0e1ced04cfb73258.tar.gz
volse-hubzilla-30e86284af3cdf64cf4f5f6a0e1ced04cfb73258.tar.bz2
volse-hubzilla-30e86284af3cdf64cf4f5f6a0e1ced04cfb73258.zip
upstream
Diffstat (limited to 'include/conversation.php')
-rw-r--r--include/conversation.php10
1 files changed, 9 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 2edb551a5..3bbaf0cba 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -496,6 +496,13 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
}
}
+ if(intval(get_config('system','thread_allow')) && $a->theme_thread_allow) {
+ $comments_threaded = true;
+ }
+ else {
+ $comments_threaded = false;
+ }
+
if($page_writeable) {
$buttons = array(
'like' => array( t("I like this \x28toggle\x29"), t("like")),
@@ -512,7 +519,8 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
$qcomment = (($qc) ? explode("\n",$qc) : null);
}
$comment = replace_macros($cmnt_tpl,array(
- '$return_path' => '',
+ '$return_path' => '',
+ '$threaded' => $comments_threaded,
'$jsreload' => (($mode === 'display') ? $_SESSION['return_url'] : ''),
'$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'),
'$id' => $item['item_id'],