Updating 4.3-dev with changes from 4.2-dev

administrator/components/com_actionlogs/src/Helper/ActionlogsHelper.php

@@ -200,7 +200,7 @@ public static function getHumanReadableLogMessage($log, $generateLinks = true)
 
         foreach ($messageData as $key => $value) {
             // Escape any markup in the values to prevent XSS attacks
-            $value = htmlspecialchars($value, ENT_QUOTES, 'UTF-8');
+            $value = $value !== null ? htmlspecialchars($value, ENT_QUOTES, 'UTF-8') : '';
 
             // Convert relative url to absolute url so that it is clickable in action logs notification email
             if ($generateLinks && StringHelper::strpos($value, 'index.php?') === 0) {

administrator/components/com_admin/sql/updates/mysql/4.0.0-2020-12-20.sql

@@ -12,8 +12,8 @@ INSERT IGNORE INTO `#__mail_templates` (`template_id`, `language`, `subject`, `b
 ('com_users.registration.user.admin_activation_w_pw', '', 'COM_USERS_EMAIL_ACCOUNT_DETAILS', 'COM_USERS_EMAIL_REGISTERED_WITH_ADMIN_ACTIVATION_BODY', '', '', '{"tags":["name","sitename","activate","siteurl","username","password_clear"]}'),
 ('com_users.registration.user.self_activation', '', 'COM_USERS_EMAIL_ACCOUNT_DETAILS', 'COM_USERS_EMAIL_REGISTERED_WITH_ACTIVATION_BODY_NOPW', '', '', '{"tags":["name","sitename","activate","siteurl","username"]}'),
 ('com_users.registration.user.self_activation_w_pw', '', 'COM_USERS_EMAIL_ACCOUNT_DETAILS', 'COM_USERS_EMAIL_REGISTERED_WITH_ACTIVATION_BODY', '', '', '{"tags":["name","sitename","activate","siteurl","username","password_clear"]}'),
-('com_users.registration.user.registration_mail', '', 'COM_USERS_EMAIL_ACCOUNT_DETAILS', 'COM_USERS_EMAIL_REGISTERED_BODY_NOPW', '', '', '{"tags":["name","sitename","activate","siteurl","username"]}'),
-('com_users.registration.user.registration_mail_w_pw', '', 'COM_USERS_EMAIL_ACCOUNT_DETAILS', 'COM_USERS_EMAIL_REGISTERED_BODY', '', '', '{"tags":["name","sitename","activate","siteurl","username","password_clear"]}'),
+('com_users.registration.user.registration_mail', '', 'COM_USERS_EMAIL_ACCOUNT_DETAILS', 'COM_USERS_EMAIL_REGISTERED_BODY_NOPW', '', '', '{"tags":["name","sitename","siteurl","username"]}'),
+('com_users.registration.user.registration_mail_w_pw', '', 'COM_USERS_EMAIL_ACCOUNT_DETAILS', 'COM_USERS_EMAIL_REGISTERED_BODY', '', '', '{"tags":["name","sitename","siteurl","username","password_clear"]}'),
 ('com_users.registration.admin.new_notification', '', 'COM_USERS_EMAIL_ACCOUNT_DETAILS', 'COM_USERS_EMAIL_REGISTERED_NOTIFICATION_TO_ADMIN_BODY', '', '', '{"tags":["name","sitename","siteurl","username"]}'),
 ('com_users.registration.user.admin_activated', '', 'COM_USERS_EMAIL_ACTIVATED_BY_ADMIN_ACTIVATION_SUBJECT', 'COM_USERS_EMAIL_ACTIVATED_BY_ADMIN_ACTIVATION_BODY', '', '', '{"tags":["name","sitename","siteurl","username"]}'),
 ('com_users.registration.admin.verification_request', '', 'COM_USERS_EMAIL_ACTIVATE_WITH_ADMIN_ACTIVATION_SUBJECT', 'COM_USERS_EMAIL_ACTIVATE_WITH_ADMIN_ACTIVATION_BODY', '', '', '{"tags":["name","sitename","email","username","activate"]}'),

administrator/components/com_admin/sql/updates/mysql/4.2.7-2022-12-29.sql

@@ -0,0 +1,7 @@
+UPDATE `#__mail_templates`
+   SET `params` = '{"tags":["name","sitename","siteurl","username"]}'
+ WHERE `template_id` = 'com_users.registration.user.registration_mail' AND `params` = '{"tags":["name","sitename","activate","siteurl","username"]}';
+
+UPDATE `#__mail_templates`
+   SET `params` = '{"tags":["name","sitename","siteurl","username","password_clear"]}'
+ WHERE `template_id` = 'com_users.registration.user.registration_mail_w_pw' AND `params` = '{"tags":["name","sitename","activate","siteurl","username","password_clear"]}';

administrator/components/com_admin/sql/updates/postgresql/4.0.0-2020-12-20.sql

@@ -12,8 +12,8 @@ INSERT INTO "#__mail_templates" ("template_id", "language", "subject", "body", "
 ('com_users.registration.user.admin_activation_w_pw', '', 'COM_USERS_EMAIL_ACCOUNT_DETAILS', 'COM_USERS_EMAIL_REGISTERED_WITH_ADMIN_ACTIVATION_BODY', '', '', '{"tags":["name","sitename","activate","siteurl","username","password_clear"]}'),
 ('com_users.registration.user.self_activation', '', 'COM_USERS_EMAIL_ACCOUNT_DETAILS', 'COM_USERS_EMAIL_REGISTERED_WITH_ACTIVATION_BODY_NOPW', '', '', '{"tags":["name","sitename","activate","siteurl","username"]}'),
 ('com_users.registration.user.self_activation_w_pw', '', 'COM_USERS_EMAIL_ACCOUNT_DETAILS', 'COM_USERS_EMAIL_REGISTERED_WITH_ACTIVATION_BODY', '', '', '{"tags":["name","sitename","activate","siteurl","username","password_clear"]}'),
-('com_users.registration.user.registration_mail', '', 'COM_USERS_EMAIL_ACCOUNT_DETAILS', 'COM_USERS_EMAIL_REGISTERED_BODY_NOPW', '', '', '{"tags":["name","sitename","activate","siteurl","username"]}'),
-('com_users.registration.user.registration_mail_w_pw', '', 'COM_USERS_EMAIL_ACCOUNT_DETAILS', 'COM_USERS_EMAIL_REGISTERED_BODY', '', '', '{"tags":["name","sitename","activate","siteurl","username","password_clear"]}'),
+('com_users.registration.user.registration_mail', '', 'COM_USERS_EMAIL_ACCOUNT_DETAILS', 'COM_USERS_EMAIL_REGISTERED_BODY_NOPW', '', '', '{"tags":["name","sitename","siteurl","username"]}'),
+('com_users.registration.user.registration_mail_w_pw', '', 'COM_USERS_EMAIL_ACCOUNT_DETAILS', 'COM_USERS_EMAIL_REGISTERED_BODY', '', '', '{"tags":["name","sitename","siteurl","username","password_clear"]}'),
 ('com_users.registration.admin.new_notification', '', 'COM_USERS_EMAIL_ACCOUNT_DETAILS', 'COM_USERS_EMAIL_REGISTERED_NOTIFICATION_TO_ADMIN_BODY', '', '', '{"tags":["name","sitename","siteurl","username"]}'),
 ('com_users.registration.user.admin_activated', '', 'COM_USERS_EMAIL_ACTIVATED_BY_ADMIN_ACTIVATION_SUBJECT', 'COM_USERS_EMAIL_ACTIVATED_BY_ADMIN_ACTIVATION_BODY', '', '', '{"tags":["name","sitename","siteurl","username"]}'),
 ('com_users.registration.admin.verification_request', '', 'COM_USERS_EMAIL_ACTIVATE_WITH_ADMIN_ACTIVATION_SUBJECT', 'COM_USERS_EMAIL_ACTIVATE_WITH_ADMIN_ACTIVATION_BODY', '', '', '{"tags":["name","sitename","email","username","activate"]}'),

administrator/components/com_admin/sql/updates/postgresql/4.2.7-2022-12-29.sql

@@ -0,0 +1,7 @@
+UPDATE "#__mail_templates"
+   SET "params" = '{"tags":["name","sitename","siteurl","username"]}'
+ WHERE "template_id" = 'com_users.registration.user.registration_mail' AND "params" = '{"tags":["name","sitename","activate","siteurl","username"]}';
+
+UPDATE "#__mail_templates"
+   SET "params" = '{"tags":["name","sitename","siteurl","username","password_clear"]}'
+ WHERE "template_id" = 'com_users.registration.user.registration_mail_w_pw' AND "params" = '{"tags":["name","sitename","activate","siteurl","username","password_clear"]}';

administrator/components/com_categories/src/Helper/CategoryAssociationHelper.php

@@ -53,9 +53,17 @@ public static function getCategoryAssociations($id = 0, $extension = 'com_conten
                 if (class_exists($helperClassname) && \is_callable(array($helperClassname, 'getCategoryRoute'))) {
                     $return[$tag] = $helperClassname::getCategoryRoute($item, $tag, $layout);
                 } else {
-                    $viewLayout = $layout ? '&layout=' . $layout : '';
+                    $link = 'index.php?option=' . $extension . '&view=category&id=' . $item;
 
-                    $return[$tag] = 'index.php?option=' . $extension . '&view=category&id=' . $item . $viewLayout;
+                    if ($tag && $tag !== '*') {
+                        $link .= '&lang=' . $tag;
+                    }
+
+                    if ($layout) {
+                        $link .= '&layout=' . $layout;
+                    }
+
+                    $return[$tag] = $link;
                 }
             }
         }

administrator/components/com_categories/src/Model/CategoryModel.php

@@ -825,7 +825,8 @@ protected function batchFlipordering($value, $pks, $contexts)
          * Re-order with max - ordering
          */
         foreach ($pks as $id) {
-            $query->select('MAX(' . $db->quoteName('ordering') . ')')
+            $query->clear()
+                ->select('MAX(' . $db->quoteName('ordering') . ')')
                 ->from($db->quoteName('#__content'))
                 ->where($db->quoteName('catid') . ' = :catid')
                 ->bind(':catid', $id, ParameterType::INTEGER);
@@ -835,9 +836,8 @@ protected function batchFlipordering($value, $pks, $contexts)
             $max = (int) $db->loadResult();
             $max++;
 
-            $query->clear();
-
-            $query->update($db->quoteName('#__content'))
+            $query->clear()
+                ->update($db->quoteName('#__content'))
                 ->set($db->quoteName('ordering') . ' = :max - ' . $db->quoteName('ordering'))
                 ->where($db->quoteName('catid') . ' = :catid')
                 ->bind(':max', $max, ParameterType::INTEGER)

administrator/components/com_contenthistory/src/View/History/HtmlView.php

@@ -93,15 +93,21 @@ protected function addToolbar(): Toolbar
         $token = Session::getFormToken();
 
         // Clean up input to ensure a clean url.
-        $aliasArray = explode('.', $this->state->item_id);
-        $option     = $aliasArray[1] == 'category'
-            ? 'com_categories&extension=' . implode('.', array_slice($aliasArray, 0, count($aliasArray) - 2))
-            : $aliasArray[0];
         $filter     = InputFilter::getInstance();
+        $aliasArray = explode('.', $this->state->item_id);
+
+        if ($aliasArray[1] === 'category') {
+            $option = 'com_categories';
+            $append = '&extension=' . $filter->clean($aliasArray[0], 'cmd');
+        } else {
+            $option = $aliasArray[0];
+            $append = '';
+        }
+
         $task       = $filter->clean($aliasArray[1], 'cmd') . '.loadhistory';
 
         // Build the final urls.
-        $loadUrl    = Route::_('index.php?option=' . $filter->clean($option, 'cmd') . '&task=' . $task . '&' . $token . '=1');
+        $loadUrl    = Route::_('index.php?option=' . $filter->clean($option, 'cmd') . $append . '&task=' . $task . '&' . $token . '=1');
         $previewUrl = Route::_('index.php?option=com_contenthistory&view=preview&layout=preview&tmpl=component&' . $token . '=1');
         $compareUrl = Route::_('index.php?option=com_contenthistory&view=compare&layout=compare&tmpl=component&' . $token . '=1');
 

administrator/components/com_fields/src/Model/FieldModel.php

@@ -317,8 +317,17 @@ private function checkDefaultValue($data)
         }
 
         try {
+            $element = simplexml_import_dom($node->firstChild);
+            $value   = $data['default_value'];
+
+            if ($data['type'] === 'checkboxes') {
+                $value = explode(',', $value);
+            } elseif ($element['multiple'] && \is_string($value) && \is_array(json_decode($value, true))) {
+                $value = (array)json_decode($value);
+            }
+
             // Perform the check
-            $result = $rule->test(simplexml_import_dom($node->firstChild), $data['default_value']);
+            $result = $rule->test($element, $value);
 
             // Check if the test succeeded
             return $result === true ? : Text::_('COM_FIELDS_FIELD_INVALID_DEFAULT_VALUE');

administrator/components/com_finder/src/Field/ContentmapField.php

@@ -80,7 +80,8 @@ protected function getGroups()
             }
 
             foreach ($parents[1] as $branch) {
-                $groups[$branch->text] = $this->prepareLevel($branch->value, $parents);
+                $text = Text::_(LanguageHelper::branchSingular($branch->text));
+                $groups[$text] = $this->prepareLevel($branch->value, $parents);
             }
         }
 

administrator/components/com_media/resources/scripts/mediamanager.es6.js

@@ -29,34 +29,33 @@ window.MediaManager = window.MediaManager || {};
 window.MediaManager.Event = new Event();
 
 // Create the Vue app instance
-const app = createApp(App);
-app.use(store);
-app.use(translate);
+createApp(App)
+  .use(store)
+  .use(translate)
 
-// Register the vue components
-app.component('MediaDrive', Drive);
-app.component('MediaDisk', Disk);
-app.component('MediaTree', Tree);
-app.component('MediaToolbar', Toolbar);
-app.component('MediaBreadcrumb', Breadcrumb);
-app.component('MediaBrowser', Browser);
-app.component('MediaBrowserItem', BrowserItem);
-app.component('MediaBrowserItemRow', BrowserItemRow);
-app.component('MediaModal', Modal);
-app.component('MediaCreateFolderModal', CreateFolderModal);
-app.component('MediaPreviewModal', PreviewModal);
-app.component('MediaRenameModal', RenameModal);
-app.component('MediaShareModal', ShareModal);
-app.component('MediaConfirmDeleteModal', ConfirmDeleteModal);
-app.component('MediaInfobar', Infobar);
-app.component('MediaUpload', Upload);
-app.component('MediaBrowserActionItemToggle', Toggle);
-app.component('MediaBrowserActionItemPreview', Preview);
-app.component('MediaBrowserActionItemDownload', Download);
-app.component('MediaBrowserActionItemRename', Rename);
-app.component('MediaBrowserActionItemShare', Share);
-app.component('MediaBrowserActionItemDelete', Delete);
-app.component('MediaBrowserActionItemEdit', Edit);
-app.component('MediaBrowserActionItemsContainer', Container);
-
-app.mount('#com-media');
+  // Register the vue components
+  .component('MediaDrive', Drive)
+  .component('MediaDisk', Disk)
+  .component('MediaTree', Tree)
+  .component('MediaToolbar', Toolbar)
+  .component('MediaBreadcrumb', Breadcrumb)
+  .component('MediaBrowser', Browser)
+  .component('MediaBrowserItem', BrowserItem)
+  .component('MediaBrowserItemRow', BrowserItemRow)
+  .component('MediaModal', Modal)
+  .component('MediaCreateFolderModal', CreateFolderModal)
+  .component('MediaPreviewModal', PreviewModal)
+  .component('MediaRenameModal', RenameModal)
+  .component('MediaShareModal', ShareModal)
+  .component('MediaConfirmDeleteModal', ConfirmDeleteModal)
+  .component('MediaInfobar', Infobar)
+  .component('MediaUpload', Upload)
+  .component('MediaBrowserActionItemToggle', Toggle)
+  .component('MediaBrowserActionItemPreview', Preview)
+  .component('MediaBrowserActionItemDownload', Download)
+  .component('MediaBrowserActionItemRename', Rename)
+  .component('MediaBrowserActionItemShare', Share)
+  .component('MediaBrowserActionItemDelete', Delete)
+  .component('MediaBrowserActionItemEdit', Edit)
+  .component('MediaBrowserActionItemsContainer', Container)
+  .mount('#com-media');

administrator/components/com_media/resources/scripts/store/plugins/persisted-state.es6.js

@@ -1,13 +1,13 @@
 // The options for persisting state
 // eslint-disable-next-line import/prefer-default-export
 export const persistedStateOptions = {
-  key: 'joomla.mediamanager',
-  paths: [
-    'selectedDirectory',
-    'showInfoBar',
-    'listView',
-    'gridSize',
-    'search',
-  ],
   storage: window.sessionStorage,
+  key: 'joomla.mediamanager',
+  reducer: (state) => ({
+    selectedDirectory: state.selectedDirectory,
+    showInfoBar: state.showInfoBar,
+    listView: state.listView,
+    gridSize: state.gridSize,
+    search: state.search,
+  }),
 };

administrator/components/com_media/resources/scripts/store/store.es6.js

@@ -1,17 +1,16 @@
 import { createStore } from 'vuex';
-import createPersistedState from 'vuex-persistedstate';
+import VuexPersistence from 'vuex-persist';
 import state from './state.es6';
 import * as getters from './getters.es6';
 import * as actions from './actions.es6';
 import mutations from './mutations.es6';
-import { persistedStateOptions } from './plugins/persisted-state.es6';
-
+import { persistedStateOptions } from './plugins/persisted-state.es6.js';
 // A Vuex instance is created by combining the state, mutations, actions, and getters.
 export default createStore({
   state,
   getters,
   actions,
   mutations,
-  plugins: [createPersistedState(persistedStateOptions)],
+  plugins: [new VuexPersistence(persistedStateOptions).plugin],
   strict: (process.env.NODE_ENV !== 'production'),
 });

administrator/components/com_media/src/Event/AbstractMediaItemValidationEvent.php

@@ -58,12 +58,12 @@ protected function validate(\stdClass $item): void
         }
 
         // Non empty string
-        if (empty($item->name) || !is_string($item->name)) {
+        if (!isset($item->name) || !is_string($item->name) || trim($item->name) === '') {
             throw new \BadMethodCallException("Property 'name' of argument 'item' of event {$this->name} has a wrong item. Valid: non empty string");
         }
 
         // Non empty string
-        if (empty($item->path) || !is_string($item->path)) {
+        if (!isset($item->path) || !is_string($item->path) || trim($item->path) === '') {
             throw new \BadMethodCallException("Property 'path' of argument 'item' of event {$this->name} has a wrong item. Valid: non empty string");
         }
 

administrator/components/com_templates/src/Model/TemplateModel.php

@@ -1875,6 +1875,9 @@ public function child()
             }
         }
 
+        // Create the html folder
+        Folder::create($toPath . '/html');
+
         // Copy the template definition from the parent template
         if (!File::copy($fromPath, $toPath . '/templateDetails.xml')) {
             return false;
@@ -1932,6 +1935,7 @@ public function child()
 
         $files = $xml->addChild('files');
         $files->addChild('filename', 'templateDetails.xml');
+        $files->addChild('folder', 'html');
 
         // Media folder
         $media = $xml->addChild('media');
@@ -1940,7 +1944,6 @@ public function child()
         $media->addChild('folder', 'css');
         $media->addChild('folder', 'js');
         $media->addChild('folder', 'images');
-        $media->addChild('folder', 'html');
         $media->addChild('folder', 'scss');
 
         $xml->name = $template->element . '_' . $newName;
@@ -1971,7 +1974,6 @@ public function child()
             || !Folder::create($toPath . '/media/css')
             || !Folder::create($toPath . '/media/js')
             || !Folder::create($toPath . '/media/images')
-            || !Folder::create($toPath . '/media/html/tinymce')
             || !Folder::create($toPath . '/media/scss')
         ) {
             return false;

administrator/components/com_templates/src/Service/HTML/Templates.php

@@ -147,7 +147,7 @@ public function thumbModal($template, $clientId = 0)
 
             $html .= HTMLHelper::_(
                 'bootstrap.renderModal',
-                $template->name . '-Modal',
+                $template->element . '-Modal',
                 array(
                     'title'  => Text::sprintf('COM_TEMPLATES_SCREENSHOT', ucfirst($template->name)),
                     'height' => '500px',

administrator/components/com_templates/src/View/Template/HtmlView.php

@@ -296,7 +296,7 @@ protected function addToolbar()
             }
         }
 
-        if (count($this->updatedList) !== 0 && $this->pluginState) {
+        if (count($this->updatedList) !== 0 && $this->pluginState && $this->type === 'home') {
             $dropdown = $bar->dropdownButton('override-group')
                 ->text('COM_TEMPLATES_BUTTON_CHECK')
                 ->toggleSplit(false)

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

@@ -771,7 +771,7 @@ public function batchUser($groupId, $userIds, $action)
             } elseif ($doDelete === 'all') {
                 $query = $db->getQuery(true);
                 $query->delete($db->quoteName('#__user_usergroup_map'))
-                    ->whereIn($db->quoteName('user_id'), $users);
+                    ->whereIn($db->quoteName('user_id'), $userIds);
             }
             $db->setQuery($query);
 

administrator/components/com_users/tmpl/debuguser/default.php

@@ -39,7 +39,7 @@
             // Split the actions table
             foreach ($this->actions as $action) :
                 $name = $action[0];
-                if (in_array($name, ['core.login.site', 'core.login.admin', 'core.login.offline', 'core.login.api', 'core.admin'])) :
+                if (in_array($name, ['core.login.site', 'core.login.admin', 'core.login.api', 'core.login.offline'])) :
                     $loginActions[] = $action;
                 else :
                     $actions[] = $action;

administrator/language/en-GB/com_installer.ini

@@ -285,10 +285,10 @@ COM_INSTALLER_VALUE_FOLDER_NONAPPLICABLE="N/A"
 COM_INSTALLER_VALUE_FOLDER_SELECT="- Select Folder -"
 COM_INSTALLER_VALUE_PACKAGE_ID_SELECT="- Select Package -"
 COM_INSTALLER_VALUE_STATE_SELECT="- Select Status -"
-COM_INSTALLER_VALUE_SUPPORTED_EXISTS="Download Key valid"
-COM_INSTALLER_VALUE_SUPPORTED_MISSING="Download Key invalid"
+COM_INSTALLER_VALUE_SUPPORTED_EXISTS="Download Key Exists"
+COM_INSTALLER_VALUE_SUPPORTED_MISSING="Download Key Missing"
 COM_INSTALLER_VALUE_SUPPORTED_SELECT="- Select Download Key -"
-COM_INSTALLER_VALUE_SUPPORTED_SUPPORTED="Download Key supported"
+COM_INSTALLER_VALUE_SUPPORTED_SUPPORTED="Download Key Supported"
 COM_INSTALLER_VALUE_TYPE_SELECT="- Select Type -"
 COM_INSTALLER_XML_DESCRIPTION="Installer component for adding, removing and upgrading extensions"