From: Marcel Werk <burntime@woltlab.com>
Date: Fri, 23 May 2014 23:45:13 +0000 (+0200)
Subject: Search result improvements
X-Git-Tag: 2.1.0_Alpha_1~800
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=03cd58548f8c019b04bcc58831feeac0a367f669;p=GitHub%2FWoltLab%2FWCF.git

Search result improvements
---

diff --git a/com.woltlab.wcf/templates/searchResult.tpl b/com.woltlab.wcf/templates/searchResult.tpl
index aca7cf64c1..30308b0202 100644
--- a/com.woltlab.wcf/templates/searchResult.tpl
+++ b/com.woltlab.wcf/templates/searchResult.tpl
@@ -19,7 +19,7 @@
 
 <div class="contentNavigation">
 	{assign var=encodedHighlight value=$highlight|urlencode}
-	{pages print=true assign=pagesLinks controller='SearchResult' id=$searchID link="pageNo=%d&highlight=$encodedHighlight"}
+	{pages print=true application=$application assign=pagesLinks controller='SearchResult' id=$searchID link="pageNo=%d&highlight=$encodedHighlight"}
 	
 	{hascontent}
 		<nav>
diff --git a/wcfsetup/install/files/lib/form/SearchForm.class.php b/wcfsetup/install/files/lib/form/SearchForm.class.php
index ca911571c5..03104a0b26 100644
--- a/wcfsetup/install/files/lib/form/SearchForm.class.php
+++ b/wcfsetup/install/files/lib/form/SearchForm.class.php
@@ -2,6 +2,7 @@
 namespace wcf\form;
 use wcf\data\search\Search;
 use wcf\data\search\SearchAction;
+use wcf\system\application\ApplicationHandler;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\IllegalLinkException;
 use wcf\system\exception\NamedUserException;
@@ -351,8 +352,20 @@ class SearchForm extends RecaptchaForm {
 		}
 		$this->saved();
 		
+		// get application
+		$application = 'wcf';
+		if (count($this->selectedObjectTypes) == 1) {
+			$objectType = SearchEngine::getInstance()->getObjectType(reset($this->selectedObjectTypes));
+			if ($tmp = ApplicationHandler::getInstance()->getAbbreviation($objectType->packageID)) {
+				$application = $tmp;
+			}
+		}
+		
 		// forward to result page
-		HeaderUtil::redirect(LinkHandler::getInstance()->getLink('SearchResult', array('id' => $this->searchID), 'highlight='.urlencode($this->query)));
+		HeaderUtil::redirect(LinkHandler::getInstance()->getLink('SearchResult', array(
+			'id' => $this->searchID,
+			'application' => $application
+		), 'highlight='.urlencode($this->query)));
 		exit;
 	}
 	
diff --git a/wcfsetup/install/files/lib/page/SearchResultPage.class.php b/wcfsetup/install/files/lib/page/SearchResultPage.class.php
index 0542de93d8..01fa65cbc5 100644
--- a/wcfsetup/install/files/lib/page/SearchResultPage.class.php
+++ b/wcfsetup/install/files/lib/page/SearchResultPage.class.php
@@ -2,6 +2,7 @@
 namespace wcf\page;
 use wcf\data\search\ISearchResultObject;
 use wcf\data\search\Search;
+use wcf\system\application\ApplicationHandler;
 use wcf\system\breadcrumb\Breadcrumb;
 use wcf\system\event\EventHandler;
 use wcf\system\exception\IllegalLinkException;
@@ -170,7 +171,8 @@ class SearchResultPage extends MultipleLinkPage {
 			'alterable' => (!empty($this->searchData['alterable']) ? 1 : 0),
 			'objectTypes' => SearchEngine::getInstance()->getAvailableObjectTypes(),
 			'resultListTemplateName' => $this->resultListTemplateName,
-			'resultListApplication' => $this->resultListApplication
+			'resultListApplication' => $this->resultListApplication,
+			'application' => ApplicationHandler::getInstance()->getAbbreviation(ApplicationHandler::getInstance()->getActiveApplication()->packageID)
 		));
 	}