Remove erroneous hascontent tags in templates

diff --git a/templates/conversation.tpl b/templates/conversation.tpl
index 0b6e3058127c9a26912a51fd0469641c16ed46e4..40f8c1beb0a4b1cf4f6c2948cef5b96c4e1a7e4d 100644 (file)
--- a/templates/conversation.tpl
+++ b/templates/conversation.tpl
@@ -46,15 +46,13 @@
                        </ul>
                </div>
                
-               {hascontent}
-                       <nav class="contentHeaderNavigation">
-                               <ul class="conversation jsConversationInlineEditorContainer" data-conversation-id="{@$conversation->conversationID}" data-label-ids="[ {implode from=$conversation->getAssignedLabels() item=label}{@$label->labelID}{/implode} ]" data-is-closed="{@$conversation->isClosed}" data-can-close-conversation="{if $conversation->userID == $__wcf->getUser()->userID}1{else}0{/if}" data-can-add-participants="{if $conversation->canAddParticipants()}1{else}0{/if}">
-                                       <li class="jsOnly"><a href="#" class="button jsConversationInlineEditor"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.global.button.edit{/lang}</span></a></li>
-                                       {if !$conversation->isClosed}<li><a href="{link controller='ConversationMessageAdd' id=$conversationID}{/link}" title="{lang}wcf.conversation.message.add{/lang}" class="button buttonPrimary jsQuickReply"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.conversation.message.button.add{/lang}</span></a></li>{/if}
-                                       {event name='contentHeaderNavigation'}
-                               </ul>
-                       </nav>
-               {/hascontent}
+               <nav class="contentHeaderNavigation">
+                       <ul class="conversation jsConversationInlineEditorContainer" data-conversation-id="{@$conversation->conversationID}" data-label-ids="[ {implode from=$conversation->getAssignedLabels() item=label}{@$label->labelID}{/implode} ]" data-is-closed="{@$conversation->isClosed}" data-can-close-conversation="{if $conversation->userID == $__wcf->getUser()->userID}1{else}0{/if}" data-can-add-participants="{if $conversation->canAddParticipants()}1{else}0{/if}">
+                               <li class="jsOnly"><a href="#" class="button jsConversationInlineEditor"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.global.button.edit{/lang}</span></a></li>
+                               {if !$conversation->isClosed}<li><a href="{link controller='ConversationMessageAdd' id=$conversationID}{/link}" title="{lang}wcf.conversation.message.add{/lang}" class="button buttonPrimary jsQuickReply"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.conversation.message.button.add{/lang}</span></a></li>{/if}
+                               {event name='contentHeaderNavigation'}
+                       </ul>
+               </nav>
        </header>
 {/capture}
 

diff --git a/templates/conversationList.tpl b/templates/conversationList.tpl
index 07db67613311c023b39a94d24b37838f38f610f3..3463fc53338139e69feeae9aa234e2face1c45e4 100644 (file)
--- a/templates/conversationList.tpl
+++ b/templates/conversationList.tpl
@@ -6,14 +6,12 @@
                        <h1 class="contentTitle">{if $filter}{lang}wcf.conversation.folder.{$filter}{/lang}{else}{lang}wcf.conversation.conversations{/lang}{/if}</h1>
                </div>
                
-               {hascontent}
-                       <nav class="contentHeaderNavigation">
-                               <ul>
-                                       <li><a href="{link controller='ConversationAdd'}{/link}" title="{lang}wcf.conversation.add{/lang}" class="button"><span class="icon icon16 fa-asterisk"></span> <span>{lang}wcf.conversation.button.add{/lang}</span></a></li>
-                                       {event name='contentHeaderNavigation'}
-                               </ul>
-                       </nav>
-               {/hascontent}
+               <nav class="contentHeaderNavigation">
+                       <ul>
+                               <li><a href="{link controller='ConversationAdd'}{/link}" title="{lang}wcf.conversation.add{/lang}" class="button"><span class="icon icon16 fa-asterisk"></span> <span>{lang}wcf.conversation.button.add{/lang}</span></a></li>
+                               {event name='contentHeaderNavigation'}
+                       </ul>
+               </nav>
        </header>
 {/capture}