Merge branch '5.3-dev' into fix/vuecs

Author: laoneo

administrator/components/com_actionlogs/src/Model/ActionlogModel.php

@@ -126,7 +126,7 @@ protected function sendNotificationEmails($messages, $username, $context)
         $query = $db->getQuery(true);
 
         $query
-            ->select($db->quoteName(['u.email', 'u.username', 'l.extensions', 'l.exclude_self']))
+            ->select($db->quoteName(['u.email', 'l.extensions']))
             ->from($db->quoteName('#__users', 'u'))
             ->where($db->quoteName('u.block') . ' = 0')
             ->join(
@@ -142,10 +142,6 @@ protected function sendNotificationEmails($messages, $username, $context)
         $recipients = [];
 
         foreach ($users as $user) {
-            if ($user->username === $this->getCurrentUser()->username && $user->exclude_self) {
-                continue;
-            }
-
             $extensions = json_decode($user->extensions, true);
 
             if ($extensions && \in_array(strtok($context, '.'), $extensions)) {

administrator/components/com_admin/script.php

@@ -2369,6 +2369,10 @@ public function deleteUnexistingFiles($dryRun = false, $suppressOutput = false)
             '/media/system/css/system-site-offline_rtl.min.css.gz',
             '/media/system/scss/system-site-offline_rtl.scss',
             // From 5.3.0-alpha3 to 5.3.0-beta1
+            '/administrator/modules/mod_feed/mod_feed.php',
+            '/administrator/modules/mod_privacy_status/mod_privacy_status.php',
+            '/libraries/vendor/guzzlehttp/promises/src/functions.php',
+            '/libraries/vendor/guzzlehttp/promises/src/functions_include.php',
             '/libraries/vendor/maximebf/debugbar/LICENSE',
             '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/CacheCacheCollector.php',
             '/libraries/vendor/maximebf/debugbar/src/DebugBar/Bridge/DoctrineCollector.php',

administrator/components/com_admin/sql/updates/mysql/5.3.0-2024-12-19.sql

@@ -1 +1,6 @@
-ALTER TABLE `#__action_logs_users` ADD COLUMN `exclude_self` tinyint NOT NULL DEFAULT 0;
+-- --------------------------------------------------------
+-- The following statement which was introduced with 5.3.0-alpha3
+-- has been disabled as it was reverted with 5.3.0-beta1.
+-- See https://github.com/joomla/joomla-cms/pull/44845 for details.
+--
+-- ALTER TABLE `#__action_logs_users` ADD COLUMN `exclude_self` tinyint NOT NULL DEFAULT 0;

administrator/components/com_admin/sql/updates/mysql/5.3.0-2025-02-09.sql

@@ -0,0 +1 @@
+ALTER TABLE `#__action_logs_users` DROP COLUMN `exclude_self` /** CAN FAIL **/;

administrator/components/com_admin/sql/updates/postgresql/5.3.0-2024-12-19.sql

@@ -1 +1,6 @@
-ALTER TABLE "#__action_logs_users" ADD COLUMN "exclude_self" integer DEFAULT 0 NOT NULL;
+-- --------------------------------------------------------
+-- The following statement which was introduced with 5.3.0-alpha3
+-- has been disabled as it was reverted with 5.3.0-beta1.
+-- See https://github.com/joomla/joomla-cms/pull/44845 for details.
+--
+-- ALTER TABLE "#__action_logs_users" ADD COLUMN "exclude_self" integer DEFAULT 0 NOT NULL;

administrator/components/com_admin/sql/updates/postgresql/5.3.0-2025-02-09.sql

@@ -0,0 +1 @@
+ALTER TABLE "#__action_logs_users" DROP COLUMN "exclude_self" /** CAN FAIL **/;

administrator/components/com_associations/src/Controller/AssociationController.php

@@ -39,7 +39,7 @@ class AssociationController extends FormController
      */
     public function edit($key = null, $urlVar = null)
     {
-        list($extensionName, $typeName) = explode('.', $this->input->get('itemtype', '', 'string'), 2);
+        [$extensionName, $typeName] = explode('.', $this->input->get('itemtype', '', 'string'), 2);
 
         $id = $this->input->get('id', 0, 'int');
 
@@ -67,7 +67,7 @@ public function cancel($key = null)
     {
         $this->checkToken();
 
-        list($extensionName, $typeName) = explode('.', $this->input->get('itemtype', '', 'string'), 2);
+        [$extensionName, $typeName] = explode('.', $this->input->get('itemtype', '', 'string'), 2);
 
         // Only check in, if component item type allows to check out.
         if (AssociationsHelper::typeSupportsCheckout($extensionName, $typeName)) {

administrator/components/com_associations/src/Controller/AssociationsController.php

@@ -94,7 +94,7 @@ public function checkin()
         $this->setRedirect(Route::_('index.php?option=' . $this->option . '&view=' . $this->view_list, false));
 
         // Figure out if the item supports checking and check it in
-        list($extensionName, $typeName) = explode('.', $this->input->get('itemtype'));
+        [$extensionName, $typeName] = explode('.', $this->input->get('itemtype'));
 
         $extension = AssociationsHelper::getSupportedExtension($extensionName);
         $types     = $extension->get('types');

administrator/components/com_associations/src/Dispatcher/Dispatcher.php

@@ -43,7 +43,7 @@ protected function checkAccess()
         $itemType = $this->input->get('itemtype', '', 'string');
 
         if ($itemType !== '') {
-            list($extensionName, $typeName) = explode('.', $itemType);
+            [$extensionName, $typeName] = explode('.', $itemType);
 
             if (!AssociationsHelper::hasSupport($extensionName)) {
                 throw new \Exception(

administrator/components/com_associations/src/Field/ItemlanguageField.php

@@ -46,7 +46,7 @@ protected function getOptions()
     {
         $input = Factory::getApplication()->getInput();
 
-        list($extensionName, $typeName) = explode('.', $input->get('itemtype', '', 'string'), 2);
+        [$extensionName, $typeName] = explode('.', $input->get('itemtype', '', 'string'), 2);
 
         // Get the extension specific helper method
         $helper = AssociationsHelper::getExtensionHelper($extensionName);