Improved detection of article pages

diff --git a/com.woltlab.wcf/templates/pageHeaderSearch.tpl b/com.woltlab.wcf/templates/pageHeaderSearch.tpl
index 407680a0f39bc8588e04303f4422ddb61cb9d2f5..e3ca796d6a3f68e968027fe8eab6d44b6f5bdd37 100644 (file)
--- 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}