Joomla! 5.2.4

Author: Hackwar

administrator/components/com_scheduler/src/Model/TasksModel.php

@@ -35,6 +35,8 @@
  */
 class TasksModel extends ListModel
 {
+    protected $listForbiddenList = ['select', 'multi_ordering'];
+
     /**
      * Constructor.
      *
@@ -343,8 +345,19 @@ static function (TaskOption $taskOption): string {
                 }
             }
         } else {
-            // @todo Should add quoting here
-            $query->order($multiOrdering);
+            $orderClauses = [];
+
+            // Loop through provided clauses
+            foreach ($multiOrdering as $ordering) {
+                [$column, $direction] = explode(' ', $ordering);
+
+                $orderClauses[] = $db->quoteName($column) . ' ' . $direction;
+            }
+
+            // At least one correct order clause
+            if (\count($orderClauses) > 0) {
+                $query->order($orderClauses);
+            }
         }
 
         return $query;
@@ -435,6 +448,44 @@ private function attachTaskOptions(array $items): void
      */
     protected function populateState($ordering = 'a.next_execution', $direction = 'ASC'): void
     {
+        $app = Factory::getApplication();
+
+        // Clean the multiorder values
+        if ($list = $app->getUserStateFromRequest($this->context . '.list', 'list', [], 'array')) {
+            if (!empty($list['multi_ordering']) && \is_array($list['multi_ordering'])) {
+                $orderClauses = [];
+
+                // Loop through provided clauses
+                foreach ($list['multi_ordering'] as $multiOrdering) {
+                    // Split the combined string into individual variables
+                    $multiOrderingParts = explode(' ', $multiOrdering, 2);
+
+                    // Check that at least the column is present
+                    if (\count($multiOrderingParts) < 1) {
+                        continue;
+                    }
+
+                    // Assign variables
+                    $multiOrderingColumn = $multiOrderingParts[0];
+                    $multiOrderingDir    = \count($multiOrderingParts) === 2 ? $multiOrderingParts[1] : 'asc';
+
+                    // Validate provided column
+                    if (!\in_array($multiOrderingColumn, $this->filter_fields)) {
+                        continue;
+                    }
+
+                    // Validate order dir
+                    if (strtolower($multiOrderingDir) !== 'asc' && strtolower($multiOrderingDir) !== 'desc') {
+                        continue;
+                    }
+
+                    $orderClauses[] = $multiOrderingColumn . ' ' . $multiOrderingDir;
+                }
+
+                $this->setState('list.multi_ordering', $orderClauses);
+            }
+        }
+
         // Call the parent method
         parent::populateState($ordering, $direction);
     }

administrator/manifests/files/joomla.xml

@@ -6,7 +6,7 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>5.2.4-dev</version>
+	<version>5.2.4</version>
 	<creationDate>2025-02</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 

libraries/src/Version.php

@@ -66,15 +66,15 @@ final class Version
      * @var    string
      * @since  3.8.0
      */
-    public const EXTRA_VERSION = 'dev';
+    public const EXTRA_VERSION = '';
 
     /**
      * Development status.
      *
      * @var    string
      * @since  3.5
      */
-    public const DEV_STATUS = 'Development';
+    public const DEV_STATUS = 'Stable';
 
     /**
      * Code name.
@@ -90,15 +90,15 @@ final class Version
      * @var    string
      * @since  3.5
      */
-    public const RELDATE = '11-February-2025';
+    public const RELDATE = '18-February-2025';
 
     /**
      * Release time.
      *
      * @var    string
      * @since  3.5
      */
-    public const RELTIME = '16:01';
+    public const RELTIME = '16:00';
 
     /**
      * Release timezone.