Merge branch 'master' into dfeyer-task-improve-pagination

Author: dfeyer

Classes/Flowpack/SearchPlugin/EelHelper/SearchArrayHelper.php

@@ -23,14 +23,16 @@ class SearchArrayHelper implements ProtectedContextAwareInterface {
 	/**
 	 * Concatenate arrays or values to a new array
 	 *
-	 * @param array|mixed $array1 First array or value
-	 * @param array|mixed $array2 Second array or value
-	 * @param array|mixed $array_ Optional variable list of additional arrays / values
+	 * @param array|mixed $arrays First array or value
 	 * @return array The array with concatenated arrays or values
 	 */
 	public function flatten($arrays) {
 		$return = array();
-		array_walk_recursive($arrays, function($a) use (&$return) { $return[] = $a; });
+		if (is_array($arrays)) {
+			array_walk_recursive($arrays, function ($a) use (&$return) {
+				$return[] = $a;
+			});
+		}
 		return $return;
 	}
 
@@ -41,7 +43,7 @@ public function flatten($arrays) {
 	 * @return boolean
 	 */
 	public function allowsCallOfMethod($methodName) {
-		return TRUE;
+		return true;
 	}
 
 }

Resources/Private/TypoScript/SearchPlugin.ts2

@@ -7,29 +7,33 @@ prototype(Flowpack.SearchPlugin:Search) {
 
 	searchForm = Flowpack.SearchPlugin:Search.Form
 
-	searchResultRenderer = Flowpack.SearchPlugin:SearchResultRenderer
 	configuration = TYPO3.TypoScript:RawArray {
 		itemsPerPage = 25
 		insertAbove = ${false}
 		insertBelow = ${true}
 		maximumNumberOfLinks = 10
 	}
 
-    searchResultRenderer.@process.wrap = ${'<ol>' + value + '</ol>'}
+	searchResultRenderer = TYPO3.TypoScript:Tag {
+		tagName = 'ol'
+		content = Flowpack.SearchPlugin:SearchResultRenderer
+	}
 	prototype(Flowpack.SearchPlugin:SingleResult).@process.wrap = ${'<li>' + value + '</li>'}
 
 	@cache {
 		mode = 'uncached'
 		context {
 			1 = 'site'
 			2 = 'node'
+			3 = 'documentNode'
 		}
 	}
 }
 
 
 prototype(Flowpack.SearchPlugin:Search.Form) < prototype(TYPO3.TypoScript:Template) {
 	node = ${site}
+
 	templatePath = 'resource://Flowpack.SearchPlugin/Private/Templates/NodeTypes/Search.Form.html'
 	searchWord = ${request.arguments.search}
 }
@@ -41,4 +45,4 @@ prototype(Flowpack.SearchPlugin:SearchResultRenderer) < prototype(TYPO3.TypoScri
     itemName = 'node'
     // we also make the full ElasticSearch hit available to nested rendering, if possible
     itemRenderer.@override.searchHit = ${searchResults.searchHitForNode(node)}
-}
+}