Merge branch '2021.03-rc' into copyright-2021

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

diff --git a/view/templates/conversation.tpl b/view/templates/conversation.tpl
index 24f0d120d5029a055e52942e0bf75cdc380fd9f7..761a31a84226a737520ad28ebc81fdace8b6b853 100644 (file)
--- a/view/templates/conversation.tpl
+++ b/view/templates/conversation.tpl
@@ -1,10 +1,4 @@
-{{*
- *     AUTOMATICALLY GENERATED TEMPLATE
- *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{$live_update}}
-
+{{$live_update nofilter}}
 {{foreach $threads as $thread}}
 <div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper">
        {{foreach $thread.items as $item}}
@@ -22,7 +16,7 @@
        {{/foreach}}
 </div>
 {{/foreach}}
-
+{{if !$update}}
 <div id="conversation-end"></div>
 
 {{if $dropping}}
@@ -32,3 +26,4 @@
 </div>
 <div id="item-delete-selected-end"></div>
 {{/if}}
+{{/if}}