From 66b36031781a1b4b00a14a294232c1b4606e62b3 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 4 Feb 2013 18:50:55 -0800
Subject: make preview work again after search/new template change

---
 include/conversation.php                   | 6 +++---
 view/tpl/smarty3/threaded_conversation.tpl | 4 +---
 view/tpl/threaded_conversation.tpl         | 4 +---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/include/conversation.php b/include/conversation.php
index 03f53980d..8929c3aa5 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -706,7 +706,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') {
 	if($page_mode === 'preview')
 		logger('preview: ' . print_r($threads,true));
 
-//	logger('page_template: ' . $page_template);
+	logger('page_template: ' . $page_template);
 
 //	logger('nouveau: ' . print_r($threads,true));
 
@@ -722,8 +722,8 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') {
         '$dropping' => ($page_dropping?t('Delete Selected Items'):False),
     ));
 
-//	if($page_mode === 'preview')
-//		logger('preview: ' . $o);
+	if($page_mode === 'preview')
+		logger('preview: ' . $o);
 
     return $o;
 
diff --git a/view/tpl/smarty3/threaded_conversation.tpl b/view/tpl/smarty3/threaded_conversation.tpl
index 23a2564b7..a2885ddc3 100644
--- a/view/tpl/smarty3/threaded_conversation.tpl
+++ b/view/tpl/smarty3/threaded_conversation.tpl
@@ -3,11 +3,9 @@
  *	DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
  *
  *}}
-{{foreach $threads as $thread}}
-{{foreach $thread.items as $thread_item}} 
+{{foreach $threads as $thread_item}}
 {{include file="{{$thread_item.template}}" item=$thread_item}}
 {{/foreach}}
-{{/foreach}}
 
 <div id="conversation-end"></div>
 
diff --git a/view/tpl/threaded_conversation.tpl b/view/tpl/threaded_conversation.tpl
index 0f949265c..098e399b7 100644
--- a/view/tpl/threaded_conversation.tpl
+++ b/view/tpl/threaded_conversation.tpl
@@ -1,8 +1,6 @@
-{{ for $threads as $thread }}
-{{ for $thread.items as $thread_item }} 
+{{ for $threads as $thread_item }}
 {{ inc $thread_item.template with $item=$thread_item }}{{ endinc }}
 {{ endfor }}
-{{ endfor }}
 
 <div id="conversation-end"></div>
 
-- 
cgit v1.2.3