Merge remote-tracking branch 'upstream/5.4-dev' into upmerges/2025-06-18

Author: Bodge-IT

administrator/components/com_finder/src/Helper/LanguageHelper.php

@@ -13,6 +13,7 @@
 use Joomla\CMS\Factory;
 use Joomla\CMS\Language\LanguageHelper as CMSLanguageHelper;
 use Joomla\CMS\Language\Text;
+use Joomla\CMS\Plugin\PluginHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -123,16 +124,8 @@ public static function loadPluginLanguage()
 
         $loaded = true;
 
-        // Get array of all the enabled Smart Search plugin names.
-        $db    = Factory::getDbo();
-        $query = $db->getQuery(true)
-            ->select([$db->quoteName('name'), $db->quoteName('element')])
-            ->from($db->quoteName('#__extensions'))
-            ->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
-            ->where($db->quoteName('folder') . ' = ' . $db->quote('finder'))
-            ->where($db->quoteName('enabled') . ' = 1');
-        $db->setQuery($query);
-        $plugins = $db->loadObjectList();
+        // Get array of all the enabled Smart Search plugins.
+        $plugins = PluginHelper::getPlugin('finder');
 
         if (empty($plugins)) {
             return;
@@ -144,8 +137,9 @@ public static function loadPluginLanguage()
 
         // Load language file for each plugin.
         foreach ($plugins as $plugin) {
-            $lang->load($plugin->name, JPATH_ADMINISTRATOR)
-                || $lang->load($plugin->name, JPATH_PLUGINS . '/finder/' . $plugin->element);
+            $extension = 'plg_finder_' . $plugin->name;
+            $lang->load($extension, JPATH_ADMINISTRATOR)
+                || $lang->load($extension, JPATH_PLUGINS . '/finder/' . $plugin->name);
         }
     }
 }

administrator/components/com_users/src/Model/UserModel.php

@@ -351,7 +351,7 @@ public function delete(&$pks)
                     }
 
                     // Trigger the after delete event.
-                    Factory::getApplication()->triggerEvent($this->event_after_delete, [$user_to_delete->getProperties(), true, $this->getError()]);
+                    Factory::getApplication()->triggerEvent($this->event_after_delete, [ArrayHelper::fromObject($user_to_delete, false), true, $this->getError()]);
                 } else {
                     // Prune items that you can't change.
                     unset($pks[$i]);

components/com_users/src/Model/RegistrationModel.php

@@ -31,6 +31,7 @@
 use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\CMS\User\UserHelper;
 use Joomla\Database\ParameterType;
+use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -138,7 +139,7 @@ public function activate($token)
             $linkMode = $app->get('force_ssl', 0) == 2 ? Route::TLS_FORCE : Route::TLS_IGNORE;
 
             // Compile the admin notification mail values.
-            $data               = $user->getProperties();
+            $data               = ArrayHelper::fromObject($user, false);
             $data['activation'] = ApplicationHelper::getHash(UserHelper::genRandomPassword());
             $user->activation   = $data['activation'];
             $data['siteurl']    = Uri::base();
@@ -209,7 +210,7 @@ public function activate($token)
             $user->block      = '0';
 
             // Compile the user activated notification mail values.
-            $data = $user->getProperties();
+            $data = ArrayHelper::fromObject($user, false);
             $user->setParam('activate', 0);
             $data['fromname'] = $app->get('fromname');
             $data['mailfrom'] = $app->get('mailfrom');
@@ -466,7 +467,7 @@ public function register($temp)
         $query = $db->getQuery(true);
 
         // Compile the notification mail values.
-        $data             = $user->getProperties();
+        $data             = ArrayHelper::fromObject($user, false);
         $data['fromname'] = $app->get('fromname');
         $data['mailfrom'] = $app->get('mailfrom');
         $data['sitename'] = $app->get('sitename');

components/com_users/src/Model/ResetModel.php

@@ -24,6 +24,7 @@
 use Joomla\CMS\User\UserFactoryAwareInterface;
 use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\CMS\User\UserHelper;
+use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
 \defined('_JEXEC') or die;
@@ -469,7 +470,7 @@ public function processResetRequest($data)
         $link = 'index.php?option=com_users&view=reset&layout=confirm&token=' . $token;
 
         // Put together the email template data.
-        $data              = $user->getProperties();
+        $data              = ArrayHelper::fromObject($user, false);
         $data['sitename']  = $app->get('sitename');
         $data['link_text'] = Route::_($link, false, $mode);
         $data['link_html'] = Route::_($link, true, $mode);

libraries/src/User/User.php

@@ -704,7 +704,7 @@ public function save($updateOnly = false)
         // Create the user table object
         $table        = static::getTable();
         $this->params = (string) $this->_params;
-        $table->bind($this->getProperties());
+        $table->bind(ArrayHelper::fromObject($this, false));
 
         // Allow an exception to be thrown.
         try {
@@ -773,9 +773,9 @@ public function save($updateOnly = false)
             PluginHelper::importPlugin('user', null, true, $dispatcher);
 
             $saveEvent = new BeforeSaveEvent('onUserBeforeSave', [
-                'subject' => $oldUser->getProperties(),
+                'subject' => ArrayHelper::fromObject($oldUser, false),
                 'isNew'   => $isNew,
-                'data'    => $this->getProperties(),
+                'data'    => ArrayHelper::fromObject($this, false),
             ]);
             $dispatcher->dispatch('onUserBeforeSave', $saveEvent);
             $result = $saveEvent['result'] ?? [];
@@ -800,7 +800,7 @@ public function save($updateOnly = false)
 
             // Fire the onUserAfterSave event
             $dispatcher->dispatch('onUserAfterSave', new AfterSaveEvent('onUserAfterSave', [
-                'subject'      => $this->getProperties(),
+                'subject'      => ArrayHelper::fromObject($this),
                 'isNew'        => $isNew,
                 'savingResult' => $result,
                 'errorMessage' => $this->getError() ?? '',
@@ -828,7 +828,7 @@ public function delete()
 
         // Trigger the onUserBeforeDelete event
         $dispatcher->dispatch('onUserBeforeDelete', new BeforeDeleteEvent('onUserBeforeDelete', [
-            'subject' => $this->getProperties(),
+            'subject' => ArrayHelper::fromObject($this, false),
         ]));
 
         // Create the user table object
@@ -840,7 +840,7 @@ public function delete()
 
         // Trigger the onUserAfterDelete event
         $dispatcher->dispatch('onUserAfterDelete', new AfterDeleteEvent('onUserAfterDelete', [
-            'subject'        => $this->getProperties(),
+            'subject'        => ArrayHelper::fromObject($this, false),
             'deletingResult' => $result,
             'errorMessage'   => $this->getError() ?? '',
         ]));

plugins/system/jooa11y/src/Extension/Jooa11y.php

@@ -70,7 +70,7 @@ private function isAuthorisedDisplayChecker(): bool
         if (!empty($filterGroups)) {
             $userGroups = $this->getApplication()
                 ->getIdentity()
-                ->get('groups');
+                ->groups;
 
             if (!array_intersect($filterGroups, $userGroups)) {
                 $result = false;

plugins/user/joomla/src/Extension/Joomla.php

@@ -390,7 +390,7 @@ public function onUserLogout(LogoutEvent $event)
         $userid = (int) $user['id'];
 
         // Make sure we're a valid user first
-        if ($user['id'] === 0 && !$my->get('tmp_user')) {
+        if ($user['id'] === 0 && !empty($my->tmp_user)) {
             return;
         }