Improve query params handling to support search and other extensions (#…

…32) * Improve query params handling to support search and other extensions * Apply fixes from StyleCI Co-authored-by: StyleCI Bot <[email protected]>
FriendsOfFlarum · Oct 25, 2022 · d1f57fd · d1f57fd
1 parent 5dadbf8
commit d1f57fd
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/Middleware/AddLanguageFilter.php b/src/Middleware/AddLanguageFilter.php
@@ -104,9 +104,15 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
      */
     private function addQueryParams(ServerRequestInterface $request, array $params, string $language): ServerRequestInterface
     {
-        return $request->withQueryParams(
-            array_merge($params, ['filter' => ['language' => $language]]),
-        );
+        // use recursive merge to preserve filters added by other extensions
+        $newParams = array_merge_recursive($params, ['filter' => ['language' => $language]]);
+
+        // If a search is in progress, add the search gambit
+        if (Arr::get($params, 'q')) {
+            $newParams['q'] = Arr::get($params, 'q').' language:'.$language;
+        }
+
+        return $request->withQueryParams($newParams);
     }
 
     private function isDiscussionListPath($request)