From 30e86284af3cdf64cf4f5f6a0e1ced04cfb73258 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 21 Aug 2012 20:03:25 -0700
Subject: upstream

---
 include/conversation.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'include/conversation.php')

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'],
-- 
cgit v1.2.3