Merge branch '5.0.x' into 5.0.x

Author: sebastian-meyer

Classes/Controller/SearchController.php

@@ -111,7 +111,8 @@ public function mainAction(): void
             return;
         }
 
-        // Get additional fields for extended search.
+        $this->addCurrentDocument();
+
         $this->addExtendedSearch();
 
         $this->enableSuggester();
@@ -206,12 +207,6 @@ public function mainAction(): void
             $this->addFacetsMenu();
         }
 
-        // Add the current document if present to fluid. This way, we can limit further searches to this document.
-        if (isset($this->requestData['id'])) {
-            $currentDocument = $this->documentRepository->findByUid($this->requestData['id']);
-            $this->view->assign('currentDocument', $currentDocument);
-        }
-
         $this->view->assign('viewData', $this->viewData);
     }
 
@@ -549,6 +544,22 @@ private function translateValue(string $field, string $value): string
         }
     }
 
+    /**
+     * Add the current document if present to fluid.
+     * This way, we can limit further searches to this document.
+     *
+     * @access private
+     *
+     * @return void
+     */
+    private function addCurrentDocument(): void
+    {
+        if (isset($this->requestData['id'])) {
+            $currentDocument = $this->documentRepository->findByUid($this->requestData['id']);
+            $this->view->assign('currentDocument', $currentDocument);
+        }
+    }
+
     /**
      * Returns the extended search form and adds the JS files necessary for extended search.
      *

Classes/Middleware/SearchSuggest.php

@@ -56,7 +56,8 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
         $solrCore = (string) $parameters['solrcore'];
         $uHash = (string) $parameters['uHash'];
         if (hash_equals(GeneralUtility::hmac((string) (new Typo3Version()) . Environment::getExtensionsPath(), 'SearchSuggest'), $uHash) === false) {
-            throw new \InvalidArgumentException('No valid parameter passed!', 1580585079);
+            // 'uHash' is invalid or missing so suggester should not be called
+            return $response;
         }
         // Perform Solr query.
         $solr = Solr::getInstance($solrCore);

Resources/Private/Partials/Lists/Pagination.html

@@ -6,15 +6,15 @@
                 <f:link.action action="{action}" addQueryString="true" argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[page]'}" additionalParams="{'tx_dlf[page]': 1, 'tx_dlf[id]': docUid}" arguments="{searchParameter: lastSearch}" title="1">1</f:link.action>
             </li>
             <li class="previous">
-                <f:link.action action="{action}" addQueryString="true" argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[page]'}" additionalParams="{'tx_dlf[page]': pagination.previousPageNumber, 'tx_dlf[id]': docUid}" arguments="{searchParameter: lastSearch}" title="{f:translate(key: 'pagination.previous')}">{f:translate(key: 'listview.prevPage')}</f:link.action>
+                <f:link.action action="{action}" addQueryString="true" argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[page]'}" additionalParams="{'tx_dlf[page]': pagination.previousPageNumber, 'tx_dlf[id]': docUid}" arguments="{searchParameter: lastSearch}" title="{f:translate(key: 'pagination.previous')}">{f:translate(key: 'listview.prevPage')} -> f:format.raw()</f:link.action>
             </li>
         </f:then>
         <f:else>
             <li class="first disabled">
                 <span>1</span>
             </li>
             <li class="previous disabled">
-                <span>{f:translate(key: 'listview.prevPage')}</span>
+                <span>{f:translate(key: 'listview.prevPage') -> f:format.raw()}</span>
             </li>
         </f:else>
     </f:if>
@@ -53,15 +53,15 @@
     <f:if condition="{pagination.nextPageNumberG} && {pagination.nextPageNumberG} <= {pagination.lastPageNumber}">
         <f:then>
             <li class="next">
-                <f:link.action action="{action}" addQueryString="true" argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[page]'}" additionalParams="{'tx_dlf[page]': pagination.nextPageNumber, 'tx_dlf[id]': docUid}" arguments="{searchParameter: lastSearch}" title="{f:translate(key: 'nextPage')}">{f:translate(key: 'listview.nextPage')}</f:link.action>
+                <f:link.action action="{action}" addQueryString="true" argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[page]'}" additionalParams="{'tx_dlf[page]': pagination.nextPageNumber, 'tx_dlf[id]': docUid}" arguments="{searchParameter: lastSearch}" title="{f:translate(key: 'nextPage')}">{f:translate(key: 'listview.nextPage') -> f:format.raw()}</f:link.action>
             </li>
             <li class="last">
                 <f:link.action action="{action}" addQueryString="true" argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[page]'}" additionalParams="{'tx_dlf[page]': pagination.lastPageNumberG, 'tx_dlf[id]': docUid}" arguments="{searchParameter: lastSearch}" title="{pagination.lastPageNumber}">{pagination.lastPageNumber}</f:link.action>
             </li>
         </f:then>
         <f:else>
             <li class="next disabled">
-                <span>{f:translate(key: 'listview.nextPage')}</span>
+                <span>{f:translate(key: 'listview.nextPage') -> f:format.raw()}</span>
             </li>
             <li class="last disabled">
                 <span>{pagination.lastPageNumber}</span>