Fix broken additional params within method tx_dlf_search->main()

kitodo · Dec 20, 2017 · 42a25ef · 42a25ef
1 parent f374d60
commit 42a25ef
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/dlf/plugins/search/class.tx_dlf_search.php b/dlf/plugins/search/class.tx_dlf_search.php
@@ -693,10 +693,8 @@ public function main($content, $conf) {
 				$linkConf['parameter'] = $this->conf['targetPidPageView'];
 
 				$additionalParams['id'] = $results->current()['uid'];
-				$additionalParams['highlight_word'] = $results->current()['uid'];
-				$additionalParams['page'] = $results->current()['uid'];
-
-				$linkConf['additionalParams'] = \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE);
+				$additionalParams['highlight_word'] = preg_replace('/\s\s+/', ';', $results->metadata['searchString']);
+				$additionalParams['page'] = count($results[0]['subparts']) == 1?$results[0]['subparts'][0]['page']:1;
 
 			} else {
 
@@ -708,12 +706,12 @@ public function main($content, $conf) {
 					$additionalParams['order'] = $this->piVars['order'];
 					$additionalParams['asc'] = !empty($this->piVars['asc']) ? '1' : '0';
 
-					$linkConf['additionalParams'] = \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE);
-
 				}
 
 			}
 
+			$linkConf['additionalParams'] = \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE);
+
 			// Send headers.
 			header('Location: '.\TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl($this->cObj->typoLink_URL($linkConf)));