[5.1] Upmerges 2024-08-10

administrator/components/com_content/src/Field/VotelistField.php

@@ -37,7 +37,7 @@ class VotelistField extends ListField
      *
      * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
      * @param   mixed              $value    The form field value to validate.
-     * @param   string             $group    The field name group control value. This acts as as an array container for the field.
+     * @param   string             $group    The field name group control value. This acts as an array container for the field.
      *                                       For example if the field has name="foo" and the group value is set to "bar" then the
      *                                       full field name would end up being "bar[foo]".
      *

administrator/components/com_content/src/Field/VoteradioField.php

@@ -37,7 +37,7 @@ class VoteradioField extends RadioField
      *
      * @param   \SimpleXMLElement  $element  The SimpleXMLElement object representing the `<field>` tag for the form field object.
      * @param   mixed              $value    The form field value to validate.
-     * @param   string             $group    The field name group control value. This acts as as an array container for the field.
+     * @param   string             $group    The field name group control value. This acts as an array container for the field.
      *                                       For example if the field has name="foo" and the group value is set to "bar" then the
      *                                       full field name would end up being "bar[foo]".
      *

administrator/components/com_content/src/View/Articles/HtmlView.php

@@ -234,7 +234,6 @@ protected function addToolbar()
             if (
                 $user->authorise('core.create', 'com_content')
                 && $user->authorise('core.edit', 'com_content')
-                && $user->authorise('core.execute.transition', 'com_content')
             ) {
                 $childBar->popupButton('batch', 'JTOOLBAR_BATCH')
                     ->popupType('inline')

administrator/components/com_fields/src/Field/FieldLayoutField.php

@@ -56,9 +56,9 @@ protected function getInput()
             // Build the query.
             $query->select('element, name')
                 ->from('#__extensions')
-                ->where('client_id = 0')
-                ->where('type = ' . $db->quote('template'))
-                ->where('enabled = 1');
+                ->where($db->quoteName('client_id') . ' = 0')
+                ->where($db->quoteName('type') . ' = ' . $db->quote('template'))
+                ->where($db->quoteName('enabled') . ' = 1');
 
             // Set the query and load the templates.
             $db->setQuery($query);

administrator/components/com_users/src/Helper/Mfa.php

@@ -77,7 +77,7 @@ public static function getConfigurationInterface(User $user): ?string
         /** @var CMSApplication $app */
         $app = Factory::getApplication();
 
-        if (!$app->getInput()->getCmd('option', '') === 'com_users') {
+        if ($app->getInput()->getCmd('option', '') !== 'com_users') {
             $app->getLanguage()->load('com_users');
             $app->getDocument()
                 ->getWebAssetManager()

build/build-modules-js/javascript/compile-to-es2017.es6.js

@@ -12,6 +12,13 @@ const { renderSync } = require('sass-embedded');
 const { minifyJsCode } = require('./minify.es6.js');
 const { getPackagesUnderScope } = require('../init/common/resolve-package.es6.js');
 
+function esmOrIife(file) {
+  if (file.endsWith('core.es6.js') || file.endsWith('validate.es6.js')) {
+    return 'iife';
+  }
+  return 'es';
+}
+
 const getWcMinifiedCss = async (file) => {
   let scssFileExists = false;
   const scssFile = file.replace(`${sep}js${sep}`, `${sep}scss${sep}`).replace(/\.w-c\.es6\.js$/, '.scss');
@@ -126,7 +133,7 @@ module.exports.handleESMFile = async (file) => {
   });
 
   bundle.write({
-    format: 'es',
+    format: esmOrIife(file),
     sourcemap: false,
     file: resolve(`${newPath}.js`),
   })