Merge branch '2021.03-rc' into copyright-2021

[friendica.git] / view / templates / threaded_conversation.tpl

diff --git a/view/templates/threaded_conversation.tpl b/view/templates/threaded_conversation.tpl
index 6a230142baece8f5c522c3ceaec54a541ae67bad..f4a47354ed20c75c6b53f4529faa8b9e2d8484db 100644 (file)
--- a/view/templates/threaded_conversation.tpl
+++ b/view/templates/threaded_conversation.tpl
@@ -1,10 +1,8 @@
-
-{{$live_update}}
-
+{{$live_update nofilter}}
 {{foreach $threads as $thread}}
 {{include file="{{$thread.template}}" item=$thread}}
 {{/foreach}}
-
+{{if !$update}}
 <div id="conversation-end"></div>
 
 {{if $dropping}}
@@ -15,3 +13,4 @@
 <img id="item-delete-selected-rotator" class="like-rotator" src="images/rotator.gif" style="display: none;" />
 <div id="item-delete-selected-end"></div>
 {{/if}}
+{{/if}}