Merge remote-tracking branch 'upstream/5.3-dev' into upmerges/2024-11-20

Author: Bodge-IT

administrator/components/com_admin/script.php

@@ -568,19 +568,38 @@ public function getDirectory(bool $public = false): array
 
         $this->addDirectory('components', JPATH_SITE . '/components');
 
-        $this->addDirectory($cparams->get('image_path'), JPATH_SITE . '/' . $cparams->get('image_path'));
+        $imagesDir = $cparams->get('image_path', 'images');
+        $filesDir  = $cparams->get('file_path', 'files');
+
+        $this->addDirectory($imagesDir, JPATH_SITE . '/' . $imagesDir);
 
         // List all images folders
-        $image_folders = new \DirectoryIterator(JPATH_SITE . '/' . $cparams->get('image_path'));
+        $image_folders = new \DirectoryIterator(JPATH_SITE . '/' . $imagesDir);
+
 
         foreach ($image_folders as $folder) {
             if ($folder->isDot() || !$folder->isDir()) {
                 continue;
             }
 
             $this->addDirectory(
-                'images/' . $folder->getFilename(),
-                JPATH_SITE . '/' . $cparams->get('image_path') . '/' . $folder->getFilename()
+                $imagesDir . '/' . $folder->getFilename(),
+                JPATH_SITE . '/' . $imagesDir . '/' . $folder->getFilename()
+            );
+        }
+
+        $this->addDirectory($filesDir, JPATH_SITE . '/' . $filesDir);
+
+        $files_folders = new \DirectoryIterator(JPATH_SITE . '/' . $filesDir);
+
+        foreach ($files_folders as $folder) {
+            if ($folder->isDot() || !$folder->isDir()) {
+                continue;
+            }
+
+            $this->addDirectory(
+                $filesDir . '/' . $folder->getFilename(),
+                JPATH_SITE . '/' . $filesDir . '/' . $folder->getFilename()
             );
         }
 

administrator/components/com_admin/sql/updates/mysql/5.2.0-2024-09-24.sql renamed to administrator/components/com_admin/sql/updates/mysql/5.2.2-2024-09-24.sql

@@ -143,6 +143,14 @@ protected function populateState($ordering = 'a.id', $direction = 'desc')
             $this->context .= '.' . $forcedLanguage;
         }
 
+        // Required content filters for the administrator menu
+        $this->getUserStateFromRequest($this->context . '.filter.category_id', 'filter_category_id');
+        $this->getUserStateFromRequest($this->context . '.filter.level', 'filter_level');
+        $this->getUserStateFromRequest($this->context . '.filter.author_id', 'filter_author_id');
+        $this->getUserStateFromRequest($this->context . '.filter.tag', 'filter_tag', '');
+        $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access');
+        $this->getUserStateFromRequest($this->context . '.filter.language', 'filter_language', '');
+
         // List state information.
         parent::populateState($ordering, $direction);
 

administrator/components/com_admin/sql/updates/postgresql/5.2.0-2024-09-24.sql renamed to administrator/components/com_admin/sql/updates/postgresql/5.2.2-2024-09-24.sql

@@ -154,7 +154,7 @@ public function check()
         // Verify that the name is unique
         $table = new self($this->_db, $this->getDispatcher());
 
-        if ($table->load(['name' => $this->name, 'context' => $this->context]) && ($table->id != $this->id || $this->id == 0)) {
+        if ($table->load(['name' => $this->name]) && ($table->id != $this->id || $this->id == 0)) {
             $this->setError(Text::_('COM_FIELDS_ERROR_UNIQUE_NAME'));
 
             return false;

administrator/components/com_admin/src/Model/SysinfoModel.php

@@ -365,7 +365,7 @@ class_alias(DebugAdapter::class, Adapter::class);
             $output .= '<dl class="row">';
 
             foreach (DebugIndexer::$item as $key => $value) {
-                $output .= '<dt class="col-sm-2">' . $key . '</dt><dd class="col-sm-10">' . $value . '</dd>';
+                $output .= '<dt class="col-sm-2">' . $key . '</dt><dd class="col-sm-10 text-break">' . $value . '</dd>';
             }
 
             $output .= '</dl>';
@@ -375,7 +375,7 @@ class_alias(DebugAdapter::class, Adapter::class);
             $output .= '<dl class="row">';
 
             foreach (DebugIndexer::$item->getElements() as $key => $element) {
-                $output .= '<dt class="col-sm-2">' . $key . '</dt><dd class="col-sm-10">' . $element . '</dd>';
+                $output .= '<dt class="col-sm-2">' . $key . '</dt><dd class="col-sm-10 text-break">' . $element . '</dd>';
             }
 
             $output .= '</dl>';
@@ -392,7 +392,7 @@ class_alias(DebugAdapter::class, Adapter::class);
             ];
 
             foreach (DebugIndexer::$item->getInstructions() as $key => $element) {
-                $output .= '<dt class="col-sm-2">' . $contexts[$key] . '</dt><dd class="col-sm-10">' . json_encode($element) . '</dd>';
+                $output .= '<dt class="col-sm-2">' . $contexts[$key] . '</dt><dd class="col-sm-10 text-break">' . json_encode($element) . '</dd>';
             }
 
             $output .= '</dl>';
@@ -402,7 +402,7 @@ class_alias(DebugAdapter::class, Adapter::class);
             $output .= '<dl class="row">';
 
             foreach (DebugIndexer::$item->getTaxonomy() as $key => $element) {
-                $output .= '<dt class="col-sm-2">' . $key . '</dt><dd class="col-sm-10">' . json_encode($element) . '</dd>';
+                $output .= '<dt class="col-sm-2">' . $key . '</dt><dd class="col-sm-10 text-break">' . json_encode($element) . '</dd>';
             }
 
             $output .= '</dl>';

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

@@ -23,4 +23,21 @@
  */
 class StepController extends FormController
 {
+    /**
+     * Gets the URL arguments to append to a list redirect.
+     *
+     * @return  string  The arguments to append to the redirect URL.
+     *
+     * @since  5.2.2
+     */
+    protected function getRedirectToListAppend()
+    {
+        $append = parent::getRedirectToListAppend();
+        $tourId = $this->app->getUserState('com_guidedtours.tour_id');
+        if (!empty($tourId)) {
+            $append .= '&tour_id=' . $tourId;
+        }
+
+        return $append;
+    }
 }

administrator/components/com_fields/src/Table/FieldTable.php

@@ -24,6 +24,7 @@
 use Joomla\Database\Exception\ExecutionFailureException;
 use Joomla\Database\ParameterType;
 use Joomla\Database\QueryInterface;
+use Joomla\Filesystem\Path;
 use Joomla\Utilities\ArrayHelper;
 
 // phpcs:disable PSR1.Files.SideEffects
@@ -358,10 +359,24 @@ public function update($uids, $minimumStability = Updater::STABILITY_STABLE)
                 $update->set('extra_query', $updateSiteInstance->extra_query);
             }
 
-            $this->preparePreUpdate($update, $instance);
-
-            // Install sets state and enqueues messages
-            $res = $this->install($update);
+            try {
+                $this->preparePreUpdate($update, $instance);
+
+                // Install sets state and enqueues messages
+                $res = $this->install($update);
+            } catch (\Throwable $t) {
+                $res = false;
+
+                Factory::getApplication()->enqueueMessage(
+                    Text::sprintf(
+                        'COM_INSTALLER_UPDATE_ERROR',
+                        $instance->name,
+                        $t->getMessage(),
+                        (JDEBUG ? str_replace(JPATH_ROOT, 'JROOT', Path::clean($t->getFile())) . ':' . $t->getLine() : '')
+                    ),
+                    'error'
+                );
+            }
 
             if ($res) {
                 $instance->delete($uid);

administrator/components/com_finder/src/Controller/IndexerController.php

@@ -123,7 +123,7 @@ public function install()
         Log::add(Text::_('COM_JOOMLAUPDATE_UPDATE_LOG_INSTALL'), Log::INFO, 'Update');
 
         $file = $this->app->getUserState('com_joomlaupdate.file', null);
-        $model->createRestorationFile($file);
+        $model->createUpdateFile($file);
 
         $this->display();
     }