From: Marcel Werk <burntime@woltlab.com>
Date: Tue, 7 Jun 2016 16:02:41 +0000 (+0200)
Subject: Improved detection of article pages
X-Git-Tag: 3.0.0_Beta_1~1500
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f6957b9d8cd9654f0eb0371ad0bf25f0f9a4b5a3;p=GitHub%2FWoltLab%2FWCF.git

Improved detection of article pages
---

diff --git a/com.woltlab.wcf/templates/pageHeaderSearch.tpl b/com.woltlab.wcf/templates/pageHeaderSearch.tpl
index 407680a0f3..e3ca796d6a 100644
--- a/com.woltlab.wcf/templates/pageHeaderSearch.tpl
+++ b/com.woltlab.wcf/templates/pageHeaderSearch.tpl
@@ -3,7 +3,7 @@
 	{capture assign='__searchTypeLabel'}{lang}wcf.search.type.{if !$__searchObjectTypeName|empty}{@$__searchObjectTypeName}{else}everywhere{/if}{/lang}{/capture}
 {/if}
 
-{if MODULE_ARTICLE && ($templateName == 'articleList' || $templateName == 'categoryArticleList' || $templateName == 'article')}
+{if MODULE_ARTICLE && $__wcf->getActivePage() != null && ($__wcf->getActivePage()->identifier == 'com.woltlab.wcf.ArticleList' || $__wcf->getActivePage()->identifier == 'com.woltlab.wcf.CategoryArticleList' || $__wcf->getActivePage()->identifier == 'com.woltlab.wcf.Article')}
 	{if $category|isset}
 		{capture assign='__searchTypeLabel'}{$category->getTitle()}{/capture}
 	{else}