Improved article search

diff --git a/com.woltlab.wcf/templates/pageHeaderSearch.tpl b/com.woltlab.wcf/templates/pageHeaderSearch.tpl
index 57db8fc972c40668619e30841c18d8e8187424a5..407680a0f39bc8588e04303f4422ddb61cb9d2f5 100644 (file)
--- a/com.woltlab.wcf/templates/pageHeaderSearch.tpl
+++ b/com.woltlab.wcf/templates/pageHeaderSearch.tpl
@@ -3,6 +3,21 @@
        {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 $category|isset}
+               {capture assign='__searchTypeLabel'}{$category->getTitle()}{/capture}
+       {else}
+               {capture assign='__searchTypeLabel'}{lang}wcf.search.type.com.woltlab.wcf.article{/lang}{/capture}
+       {/if}
+       
+       {assign var='__searchObjectTypeName' value='com.woltlab.wcf.article'}
+       
+       {capture assign='__searchTypesScoped'}
+               {if $category|isset}<li><a href="#" data-object-type="com.woltlab.wcf.article" data-parameters='{ "articleCategoryIDs[]": {@$category->categoryID} }'>{$category->getTitle()}</a></li>{/if}
+       {/capture}
+       {assign var='__searchAreaInitialized' value=true}
+{/if}
+
 {event name='settings'}
 
 <div id="pageHeaderSearch" class="pageHeaderSearch">

diff --git a/wcfsetup/install/files/lib/page/ArticlePage.class.php b/wcfsetup/install/files/lib/page/ArticlePage.class.php
index c750e0194c012fec291571db1f3b31e5577d4822..fcbae6e6ac912a5fc6e49aafb1f5e8b022401c9b 100644 (file)
--- a/wcfsetup/install/files/lib/page/ArticlePage.class.php
+++ b/wcfsetup/install/files/lib/page/ArticlePage.class.php
@@ -262,6 +262,7 @@ class ArticlePage extends AbstractPage {
                        'articleContentID' => $this->articleContentID,
                        'articleContent' => $this->articleContent,
                        'article' => $this->article,
+                       'category' => $this->article->getCategory(),
                        'previousArticle' => $this->previousArticle,
                        'nextArticle' => $this->nextArticle,
                        'commentCanAdd' => WCF::getSession()->getPermission('user.article.canAddComment'),