Merge remote-tracking branch 'upstream/5.3-dev' into 5.4-upmerge-2025-04-22

Author: muhme

administrator/components/com_content/src/Model/ArticleModel.php

@@ -587,7 +587,18 @@ protected function loadFormData()
                         ((isset($filters['published']) && $filters['published'] !== '') ? $filters['published'] : null)
                     )
                 );
-                $data->set('catid', $app->getInput()->getInt('catid', (!empty($filters['category_id']) ? $filters['category_id'] : null)));
+
+                // If multiple categories are filtered, pick the first one to avoid loading all fields
+                $filteredCategories = $filters['category_id'] ?? null;
+                $selectedCatId      = null;
+
+                if (\is_array($filteredCategories)) {
+                    $selectedCatId = (int) reset($filteredCategories);
+                } elseif (!empty($filteredCategories)) {
+                    $selectedCatId = (int) $filteredCategories;
+                }
+
+                $data->set('catid', $app->getInput()->getInt('catid', $selectedCatId));
 
                 if ($app->isClient('administrator')) {
                     $data->set('language', $app->getInput()->getString('language', (!empty($filters['language']) ? $filters['language'] : null)));

administrator/components/com_guidedtours/src/Helper/GuidedtoursHelper.php

@@ -24,7 +24,7 @@
 class GuidedtoursHelper
 {
     /**
-     * Load the translation files for an Guided Tour
+     * Load the translation files for a Guided Tour
      *
      * @param   string  $uid    Guided Tour Unique Identifier
      * @param   boolean $steps  Should tour steps language file be loaded

administrator/components/com_guidedtours/src/View/Step/HtmlView.php

@@ -23,7 +23,7 @@
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * View to edit an Step
+ * View to edit a Step
  *
  * @since 4.3.0
  */

administrator/components/com_guidedtours/src/View/Tour/HtmlView.php

@@ -23,7 +23,7 @@
 // phpcs:enable PSR1.Files.SideEffects
 
 /**
- * View to edit an tour.
+ * View to edit a tour.
  *
  * @since 4.3.0
  */

administrator/components/com_installer/src/Model/InstallModel.php

@@ -329,7 +329,7 @@ protected function _getPackageFromUpload()
 
         // Move uploaded file.
         try {
-            File::upload($tmp_src, $tmp_dest, false, true);
+            File::upload($tmp_src, $tmp_dest);
         } catch (FilesystemException) {
             Factory::getApplication()->enqueueMessage(Text::_('COM_INSTALLER_MSG_INSTALL_WARNINSTALLUPLOADERROR'), 'error');
 

administrator/components/com_joomlaupdate/src/Model/UpdateModel.php

@@ -994,7 +994,7 @@ public function upload()
 
         // Move uploaded file.
         try {
-            File::upload($tmp_src, $tmp_dest, false);
+            File::upload($tmp_src, $tmp_dest);
         } catch (FilesystemException $exception) {
             throw new \RuntimeException(Text::_('COM_INSTALLER_MSG_INSTALL_WARNINSTALLUPLOADERROR'), 500, $exception);
         }

administrator/components/com_media/resources/scripts/components/browser/browser.vue

@@ -30,7 +30,7 @@
     <div
       v-if="isEmpty"
       class="text-center"
-      style="display: grid; justify-content: center; align-content: center; margin-top: -1rem; color: var(--gray-200); height: 100%;"
+      style="display: grid; justify-content: center; align-content: center; color: var(--gray-200); height: 100%;"
     >
       <span
         class="fa-8x icon-cloud-upload upload-icon"

build/media_source/templates/administrator/atum/scss/blocks/_form.scss

@@ -164,7 +164,8 @@ label.valid {
 }
 
 .filter-search-bar__description {
-  bottom: 100%;
+  top: 100%;
+  bottom: auto;
 }
 
 .container-popup .filter-search-bar__description {

build/media_source/templates/site/cassiopeia/scss/blocks/_form.scss

@@ -96,6 +96,7 @@ td .form-control {
 
   &[id^=id-skip-] {
     right: auto;
+    max-width: unset;
   }
 
   &[id^=cbunpublish] {

build/media_source/vendor/tinymce/langs/da.es5.js

@@ -120,7 +120,7 @@ tinymce.addI18n('da',{
 "Source": "Kilde",
 "Dimensions": "Dimensioner",
 "Constrain proportions": "Behold propertioner",
-"General": "Generet",
+"General": "Generelt",
 "Advanced": "Avanceret",
 "Style": "Stil",
 "Vertical space": "Lodret afstand",