[5.1] Upmerges 2024-08-23

Author: LadySolveig

components/com_content/src/View/Archive/HtmlView.php

@@ -221,7 +221,7 @@ public function display($tpl = null)
         $this->pagination->setAdditionalUrlParam('month', $state->get('filter.month'));
         $this->pagination->setAdditionalUrlParam('year', $state->get('filter.year'));
         $this->pagination->setAdditionalUrlParam('filter-search', $state->get('list.filter'));
-        $this->pagination->setAdditionalUrlParam('catid', $app->input->get('catid', [], 'array'));
+        $this->pagination->setAdditionalUrlParam('catid', $app->getInput()->get->get('catid', [], 'array'));
 
         $this->_prepareDocument();
 

components/com_finder/src/View/Search/HtmlView.php

@@ -154,6 +154,8 @@ public function display($tpl = null)
         // Flag indicates to not add limitstart=0 to URL
         $this->pagination->hideEmptyLimitstart = true;
 
+        $input = $app->getInput()->get;
+
         // Add additional parameters
         $queryParameterList = [
             'f'  => 'int',
@@ -164,10 +166,12 @@ public function display($tpl = null)
             'd2' => 'string',
             'w1' => 'string',
             'w2' => 'string',
+            'o'  => 'word',
+            'od' => 'word',
         ];
 
         foreach ($queryParameterList as $parameter => $filter) {
-            $value = $app->input->get($parameter, null, $filter);
+            $value = $input->get($parameter, null, $filter);
 
             if (\is_null($value)) {
                 continue;