Merge remote-tracking branch 'upstream/develop' into update

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

diff --git a/view/templates/threaded_conversation.tpl b/view/templates/threaded_conversation.tpl
index bcdcf6e7be51e7b9c117795ccca5cef0266f5976..f4a47354ed20c75c6b53f4529faa8b9e2d8484db 100644 (file)
--- a/view/templates/threaded_conversation.tpl
+++ b/view/templates/threaded_conversation.tpl
@@ -1,14 +1,8 @@
-{{*
- *     AUTOMATICALLY GENERATED TEMPLATE
- *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
- *
- *}}
-{{$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}}
@@ -19,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}}