Merge pull request #43964 from Hackwar/5.1-5.2-upmerge-2024-08-22

joomla · Aug 22, 2024 · 76a2903 · 76a2903
2 parents 1a91fa3 + 84cac13
commit 76a2903
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 11 deletions.
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
@@ -2333,6 +2333,23 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/libraries/vendor/cweagans/composer-patches/src/Patches.php',
             '/libraries/vendor/cweagans/composer-patches/tests/PatchEventTest.php',
             '/libraries/vendor/laminas/laminas-diactoros/PATCHES.txt',
+            // From 5.1.2 to 5.1.3
+            '/libraries/vendor/joomla/application/rector.php',
+            '/libraries/vendor/joomla/console/.drone.jsonnet',
+            '/libraries/vendor/joomla/console/.drone.yml',
+            '/libraries/vendor/joomla/database/.drone.jsonnet',
+            '/libraries/vendor/joomla/database/.drone.yml',
+            '/libraries/vendor/joomla/database/phpunit.appveyor_sql2012sp1.xml.dist',
+            '/libraries/vendor/joomla/database/phpunit.appveyor_sql2014.xml.dist',
+            '/libraries/vendor/joomla/database/phpunit.appveyor_sql2017.xml.dist',
+            '/libraries/vendor/joomla/database/phpunit.mariadb.xml.dist',
+            '/libraries/vendor/joomla/database/phpunit.mysql.xml.dist',
+            '/libraries/vendor/joomla/database/phpunit.mysqli.xml.dist',
+            '/libraries/vendor/joomla/database/phpunit.pgsql.xml.dist',
+            '/libraries/vendor/joomla/database/phpunit.sqlite.xml.dist',
+            '/libraries/vendor/joomla/database/phpunit.sqlsrv.xml.dist',
+            '/libraries/vendor/joomla/session/.drone.jsonnet',
+            '/libraries/vendor/joomla/session/.drone.yml',
             // From 5.2.0-alpha2 to 5.2.0-alpha3
             '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/FontAwesome.otf',
             '/libraries/vendor/maximebf/debugbar/src/DebugBar/Resources/vendor/font-awesome/fonts/fontawesome-webfont.eot',

diff --git a/components/com_content/src/View/Archive/HtmlView.php b/components/com_content/src/View/Archive/HtmlView.php
@@ -115,6 +115,7 @@ class HtmlView extends BaseHtmlView
      */
     public function display($tpl = null)
     {
+        $app        = Factory::getApplication();
         $user       = $this->getCurrentUser();
         $state      = $this->get('State');
         $items      = $this->get('Items');
@@ -219,6 +220,8 @@ public function display($tpl = null)
         $this->pagination = &$pagination;
         $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->_prepareDocument();
 

diff --git a/components/com_finder/src/View/Search/HtmlView.php b/components/com_finder/src/View/Search/HtmlView.php
@@ -154,6 +154,28 @@ public function display($tpl = null)
         // Flag indicates to not add limitstart=0 to URL
         $this->pagination->hideEmptyLimitstart = true;
 
+        // Add additional parameters
+        $queryParameterList = [
+            'f'  => 'int',
+            't'  => 'array',
+            'q'  => 'string',
+            'l'  => 'cmd',
+            'd1' => 'string',
+            'd2' => 'string',
+            'w1' => 'string',
+            'w2' => 'string',
+        ];
+
+        foreach ($queryParameterList as $parameter => $filter) {
+            $value = $app->input->get($parameter, null, $filter);
+
+            if (\is_null($value)) {
+                continue;
+            }
+
+            $this->pagination->setAdditionalUrlParam($parameter, $value);
+        }
+
         // Check for errors.
         if (\count($errors = $this->get('Errors'))) {
             throw new GenericDataException(implode("\n", $errors), 500);

diff --git a/libraries/src/Cache/Cache.php b/libraries/src/Cache/Cache.php
@@ -687,7 +687,7 @@ public static function makeId()
             'view'   => 'WORD',
             'layout' => 'WORD',
             'tpl'    => 'CMD',
-            'id'     => 'INT',
+            'id'     => 'STRING',
         ];
 
         // Use platform defaults if parameter doesn't already exist.

diff --git a/libraries/src/Mail/MailTemplate.php b/libraries/src/Mail/MailTemplate.php
@@ -72,7 +72,7 @@ class MailTemplate
     /**
      *
      * @var    string[]
-     * @since  5.2.0
+     * @since  5.1.3
      */
     protected $unsafe_tags = [];
 
@@ -224,7 +224,7 @@ public function addTemplateData($data, $plain = false)
      *
      * @return  void
      *
-     * @since   5.2.0
+     * @since   5.1.3
      */
     public function addUnsafeTags($tags)
     {

diff --git a/libraries/src/Pagination/Pagination.php b/libraries/src/Pagination/Pagination.php
@@ -665,21 +665,27 @@ protected function _buildDataObject()
 
         // Platform defaults
         $defaultUrlParams = [
-            'format' => 'WORD',
-            'option' => 'WORD',
-            'view'   => 'WORD',
-            'layout' => 'WORD',
-            'tpl'    => 'CMD',
-            'id'     => 'INT',
-            'Itemid' => 'INT',
+            'format'        => 'WORD',
+            'option'        => 'WORD',
+            'controller'    => 'WORD',
+            'view'          => 'WORD',
+            'layout'        => 'STRING',
+            'task'          => 'CMD',
+            'template'      => 'CMD',
+            'templateStyle' => 'INT',
+            'tmpl'          => 'CMD',
+            'tpl'           => 'CMD',
+            'id'            => 'STRING',
+            'Itemid'        => 'INT',
         ];
 
         // Prepare the routes
         $params = [];
+        $input  = $this->app->getInput();
 
         // Use platform defaults if parameter doesn't already exist.
         foreach ($defaultUrlParams as $param => $filter) {
-            $value = $this->app->input->get($param, null, $filter);
+            $value = $input->get($param, null, $filter);
 
             if ($value === null) {
                 continue;