conversation needs preview parameter

diff --git a/include/conversation.php b/include/conversation.php
index 1fc0642856015b4b0d80f690460662f53547e09a..90efc6d247f6dda0b2822d58bfd60316d12d5f38 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -346,7 +346,7 @@ function count_descendants($item) {
  * Recursively prepare a thread for HTML
  */
 
-function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $profile_owner, $alike, $dlike, $thread_level=1) {
+function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $profile_owner, $alike, $dlike, $previewing, $thread_level=1) {
        $result = array();
 
        $wall_template = 'wall_thread.tpl';
@@ -651,7 +651,7 @@ function prepare_threads_body($a, $items, $cmnt_tpl, $page_writeable, $mode, $pr
 
                $item_result['children'] = array();
                if(count($item['children'])) {
-                       $item_result['children'] = prepare_threads_body($a, $item['children'], $cmnt_tpl, $page_writeable, $mode, $profile_owner, $alike, $dlike, ($thread_level + 1));
+                       $item_result['children'] = prepare_threads_body($a, $item['children'], $cmnt_tpl, $page_writeable, $mode, $profile_owner, $alike, $dlike, $previewing, ($thread_level + 1));
                }
                $item_result['private'] = $item['private'];
                $item_result['toplevel'] = ($toplevelpost ? 'toplevel_item' : '');
@@ -901,7 +901,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                }
                        }
 
-                       $threads = prepare_threads_body($a, $threads, $cmnt_tpl, $page_writeable, $mode,  $profile_owner, $alike, $dlike);
+                       $threads = prepare_threads_body($a, $threads, $cmnt_tpl, $page_writeable, $mode,  $profile_owner, $alike, $dlike, $previewing);
                }
        }
                

diff --git a/mod/item.php b/mod/item.php
index 6c1c06f99a901ea505dba9368252285ad821936e..c2033d2503c65ad5b5c8483bc32ae94327cf7da9 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -608,7 +608,7 @@ function item_post(&$a) {
 
        if($preview) {
                require_once('include/conversation.php');
-               $o = conversation($a,array(array_merge($contact_record,$datarray)),'search', false);
+               $o = conversation($a,array(array_merge($contact_record,$datarray)),'search', false, true);
                logger('preview: ' . $o);
                echo json_encode(array('preview' => $o));
                killme();

diff --git a/view/theme/frost/wall_item.tpl b/view/theme/frost/wall_item.tpl
index fb9290f12ced5bb8b65bafcd1e1628bf9f27600f..e2cb60dbe0f474aeac178aacf93c0c235c2a992c 100644 (file)
--- a/view/theme/frost/wall_item.tpl
+++ b/view/theme/frost/wall_item.tpl
@@ -1,6 +1,6 @@
 <a name="$item.id" ></a>
 <!--<div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >-->
-       <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
+       <div class="wall-item-content-wrapper $item.indent $item.previewing" id="wall-item-content-wrapper-$item.id" >
                <div class="wall-item-info" id="wall-item-info-$item.id">
                        <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
                                 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 

diff --git a/view/theme/frost/wall_thread.tpl b/view/theme/frost/wall_thread.tpl
index 69f6c4c1420ee670bd18515f0ac7d3783f97ae23..008ec89dbfda04924c5dec5b656847a92dcb9756 100644 (file)
--- a/view/theme/frost/wall_thread.tpl
+++ b/view/theme/frost/wall_thread.tpl
@@ -7,7 +7,7 @@
 <div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
 <a name="$item.id" ></a>
 <!--<div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >-->
-       <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
+       <div class="wall-item-content-wrapper $item.indent $item.previewing" id="wall-item-content-wrapper-$item.id" >
                <div class="wall-item-info" id="wall-item-info-$item.id">
                        <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
                                 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 

diff --git a/view/theme/frost/wallwall_item.tpl b/view/theme/frost/wallwall_item.tpl
index 4ef81686e7ccc197564f4a36b58447974b3ec2f3..6d7a3ec323315a70bbcc6eb88a79bf4b6544058b 100644 (file)
--- a/view/theme/frost/wallwall_item.tpl
+++ b/view/theme/frost/wallwall_item.tpl
@@ -1,6 +1,6 @@
 <a name="$item.id" ></a>
 <!--<div class="wall-item-outside-wrapper $item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >-->
-       <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
+       <div class="wall-item-content-wrapper $item.indent $item.previewing wallwall" id="wall-item-content-wrapper-$item.id" >
                <div class="wall-item-info wallwall" id="wall-item-info-$item.id">
                        <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
                                <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">

diff --git a/view/theme/frost/wallwall_thread.tpl b/view/theme/frost/wallwall_thread.tpl
index 0039e8d91c46c608224c28c018118ccad7a920a6..f23cf00ab333473fbfea65a7b058805f9b36dadf 100644 (file)
--- a/view/theme/frost/wallwall_thread.tpl
+++ b/view/theme/frost/wallwall_thread.tpl
@@ -7,7 +7,7 @@
 <div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
 <a name="$item.id" ></a>
 <!--<div class="wall-item-outside-wrapper $item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >-->
-       <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
+       <div class="wall-item-content-wrapper $item.indent $item.previewing wallwall" id="wall-item-content-wrapper-$item.id" >
                <div class="wall-item-info wallwall" id="wall-item-info-$item.id">
                        <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
                                <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">