From d72a096fa55e1b0c9d78a0fc0fa5a0b72988c69d Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 15 Feb 2021 10:15:57 +0000 Subject: fix preview generating duplicate IDs --- include/conversation.php | 2 +- view/tpl/conv_item.tpl | 2 +- view/tpl/threaded_conversation.tpl | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 08d16a413..1b0db52e3 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -923,7 +923,6 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa // logger('nouveau: ' . print_r($threads,true)); - $o .= replace_macros($page_template, array( '$baseurl' => z_root(), '$photo_item' => $content_html, @@ -935,6 +934,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa '$wait' => t('Loading...'), '$conversation_tools' => t('Conversation Tools'), '$dropping' => ($page_dropping?t('Delete Selected Items'):False), + '$preview' => $preview )); return $o; diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index b021509d3..361392796 100644 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -141,7 +141,7 @@ {{$item.conlabels.1}} - + {{$item.conlabels.2}} diff --git a/view/tpl/threaded_conversation.tpl b/view/tpl/threaded_conversation.tpl index 5bc7d8386..6e773088e 100644 --- a/view/tpl/threaded_conversation.tpl +++ b/view/tpl/threaded_conversation.tpl @@ -1,9 +1,13 @@ +{{if !$preview }}
+{{/if}} {{if $photo_item}} {{$photo_item}} {{/if}} {{foreach $threads as $thread_item}} {{include file="{{$thread_item.template}}" item=$thread_item}} {{/foreach}} +{{if !$preview }}
+{{/if}} -- cgit v1.2.3