Merge branch '6.0-dev' into mvcdbtrait

Author: laoneo

administrator/components/com_actionlogs/src/Field/LogcreatorField.php

@@ -21,9 +21,7 @@
  *
  * @since  3.9.0
  *
- * No longer used, will be removed without replacement
- *
- * @deprecated  7.0  will be removed in 7.0
+ * @deprecated  5.3  will be removed in 7.0 without replacement
  */
 class LogcreatorField extends ListField
 {

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

@@ -584,7 +584,18 @@ protected function loadFormData()
                     'state',
                     ((isset($filters['published']) && $filters['published'] !== '') ? $filters['published'] : null)
                 );
-                $data->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->catid = $app->getInput()->getInt('catid', $selectedCatId);
 
                 if ($app->isClient('administrator')) {
                     $data->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

@@ -24,7 +24,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"

administrator/language/en-GB/com_joomlaupdate.ini

@@ -96,7 +96,7 @@ COM_JOOMLAUPDATE_VIEW_COMPLETE_WITH_ERROR_MESSAGE="The update completed with err
 COM_JOOMLAUPDATE_VIEW_DEFAULT_ACTUAL="Actual"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_COMPATIBILITY_CHECK="Joomla! %s Compatibility Check"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_COMPATIBLE_UPDATE_WARNING="Extensions marked with <span class='label label-warning'>X.X.X</span> have an extension update available for the current version of Joomla which is not marked as compatible with the updated version of Joomla. You should contact the extension developer for more information."
-COM_JOOMLAUPDATE_VIEW_DEFAULT_DATABASE_STRUCTURE_NOTICE="Go to 'System - Maintenance - Database' and use the 'Update Structure' button."
+COM_JOOMLAUPDATE_VIEW_DEFAULT_DATABASE_STRUCTURE_NOTICE="Go to <a href=\"index.php?option=com_installer&view=database\">'System - Maintenance - Database'</a> and use the 'Update Structure' button."
 COM_JOOMLAUPDATE_VIEW_DEFAULT_DATABASE_STRUCTURE_TITLE="Database Table Structure Up to Date"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_DB_NOT_SUPPORTED="Your database type is not supported"
 COM_JOOMLAUPDATE_VIEW_DEFAULT_DB_NOT_SUPPORTED_DESC="An update to Joomla %1$s was found, but your current database type is not supported by the new version.<br>For further details take a look at <a href=\"https://downloads.joomla.org/technical-requirements\">the minimum requirements for Joomla %1$s</a>."

administrator/language/en-GB/com_scheduler.ini

@@ -127,7 +127,7 @@ COM_SCHEDULER_OPTION_EXECUTION_MANUAL_LABEL="Manual Execution"
 COM_SCHEDULER_OPTION_ORPHANED_HIDE="Hide Orphaned"
 COM_SCHEDULER_OPTION_ORPHANED_ONLY="Only Orphaned"
 COM_SCHEDULER_OPTION_ORPHANED_SHOW="Show Orphaned"
-COM_SCHEDULER_PERMISSION_TESTRUN="Test task"
+COM_SCHEDULER_PERMISSION_TESTRUN="Run Manually"
 COM_SCHEDULER_ROUTINE_LOG_PREFIX="Task> "
 COM_SCHEDULER_RUNNING_SINCE="Running since %s"
 COM_SCHEDULER_SCHEDULER="Scheduler"
@@ -158,15 +158,15 @@ COM_SCHEDULER_TASK_TIMES_DESC="Times descending"
 COM_SCHEDULER_TASK_TYPE="Task Type"
 COM_SCHEDULER_TASK_TYPE_ASC="Task Type ascending"
 COM_SCHEDULER_TASK_TYPE_DESC="Task Type descending"
-COM_SCHEDULER_TEST_RUN="Run Test"
+COM_SCHEDULER_TEST_RUN="Run Task"
 COM_SCHEDULER_TEST_RUN_DURATION="Duration: %s seconds"
 COM_SCHEDULER_TEST_RUN_OUTPUT="Output:<br>%s"
 COM_SCHEDULER_TEST_RUN_STATUS_COMPLETED="Status: Completed"
 COM_SCHEDULER_TEST_RUN_STATUS_STARTED="Status: Started"
 COM_SCHEDULER_TEST_RUN_STATUS_TERMINATED="Status: Terminated"
 COM_SCHEDULER_TEST_RUN_TASK="Task: \"%s\""
-COM_SCHEDULER_TEST_RUN_TITLE="Test task (ID: %d)"
-COM_SCHEDULER_TEST_TASK="Test Task"
+COM_SCHEDULER_TEST_RUN_TITLE="Run Task (ID: %d)"
+COM_SCHEDULER_TEST_TASK="Run Manually"
 COM_SCHEDULER_TOOLBAR_PURGE="Clear History"
 COM_SCHEDULER_TOOLBAR_PURGE_CONFIRM="Are you sure you want to delete all Execution History?"
 COM_SCHEDULER_TOOLBAR_UNLOCK="Unlock"