Merge pull request #43469 from pe7er/5.2/upmerge/2024-05-14

[5.2] Upmerge 2024-05-14
joomla · May 14, 2024 · 5580224 · 5580224
2 parents 076864d + aa3374b
commit 5580224
Show file tree

Hide file tree

Showing 80 changed files with 523 additions and 186 deletions.
diff --git a/administrator/components/com_banners/tmpl/banners/emptystate.php b/administrator/components/com_banners/tmpl/banners/emptystate.php
@@ -17,7 +17,7 @@
 $displayData = [
     'textPrefix' => 'COM_BANNERS',
     'formURL'    => 'index.php?option=com_banners&view=banners',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help40:Banners',
+    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Banners',
     'icon'       => 'icon-bookmark banners',
 ];
 

diff --git a/administrator/components/com_banners/tmpl/clients/emptystate.php b/administrator/components/com_banners/tmpl/clients/emptystate.php
@@ -17,7 +17,7 @@
 $displayData = [
     'textPrefix' => 'COM_BANNERS_CLIENT',
     'formURL'    => 'index.php?option=com_banners&view=clients',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help40:Banners:_Clients',
+    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Banners:_Clients',
     'icon'       => 'icon-bookmark banners',
 ];
 

diff --git a/administrator/components/com_banners/tmpl/tracks/emptystate.php b/administrator/components/com_banners/tmpl/tracks/emptystate.php
@@ -14,7 +14,7 @@
 
 $displayData = [
     'textPrefix' => 'COM_BANNERS_TRACKS',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help40:Banners:_Tracks',
+    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Banners:_Tracks',
     'icon'       => 'icon-bookmark banners',
 ];
 

diff --git a/administrator/components/com_checkin/tmpl/checkin/emptystate.php b/administrator/components/com_checkin/tmpl/checkin/emptystate.php
@@ -15,7 +15,7 @@
 
 $displayData = [
     'textPrefix' => 'COM_CHECKIN',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help4.x:Maintenance:_Global_Check-in',
+    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Maintenance:_Global_Check-in',
     'icon'       => 'icon-check-square',
     'title'      => Text::_('COM_CHECKIN_GLOBAL_CHECK_IN'),
 ];

diff --git a/administrator/components/com_contact/tmpl/contacts/emptystate.php b/administrator/components/com_contact/tmpl/contacts/emptystate.php
@@ -17,7 +17,7 @@
 $displayData = [
     'textPrefix' => 'COM_CONTACT',
     'formURL'    => 'index.php?option=com_contact',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help4.x:Contacts',
+    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Contacts',
     'icon'       => 'icon-address-book contact',
 ];
 

diff --git a/administrator/components/com_fields/src/Model/FieldModel.php b/administrator/components/com_fields/src/Model/FieldModel.php
@@ -117,13 +117,17 @@ public function save($data)
             $field = $this->getItem($data['id']);
         }
 
-        if (
-            isset($data['params']['searchindex'])
-            && ((\is_null($field) && $data['params']['searchindex'] > 0)
-                || ($field->params['searchindex'] != $data['params']['searchindex'])
-                || ($data['params']['searchindex'] > 0 && ($field->state != $data['state'] || $field->access != $data['access'])))
-        ) {
-            Factory::getApplication()->enqueueMessage(Text::_('COM_FIELDS_SEARCHINDEX_MIGHT_REQUIRE_REINDEXING'), 'notice');
+        if (isset($data['params']['searchindex'])) {
+            if (\is_null($field)) {
+                if ($data['params']['searchindex'] > 0) {
+                    Factory::getApplication()->enqueueMessage(Text::_('COM_FIELDS_SEARCHINDEX_MIGHT_REQUIRE_REINDEXING'), 'notice');
+                }
+            } elseif (
+                $field->params['searchindex'] != $data['params']['searchindex']
+                || ($data['params']['searchindex'] > 0 && ($field->state != $data['state'] || $field->access != $data['access']))
+            ) {
+                Factory::getApplication()->enqueueMessage(Text::_('COM_FIELDS_SEARCHINDEX_MIGHT_REQUIRE_REINDEXING'), 'notice');
+            }
         }
 
         if (!isset($data['label']) && isset($data['params']['label'])) {

diff --git a/administrator/components/com_finder/tmpl/maps/emptystate.php b/administrator/components/com_finder/tmpl/maps/emptystate.php
@@ -16,7 +16,7 @@
 $displayData = [
     'textPrefix' => 'COM_FINDER',
     'formURL'    => 'index.php?option=com_finder&view=maps',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help4.x:Smart_Search:_Content_Maps',
+    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Smart_Search:_Content_Maps',
     'icon'       => 'icon-search-plus finder',
     'title'      => Text::_('COM_FINDER_MAPS_TOOLBAR_TITLE')
 ];

diff --git a/administrator/components/com_finder/tmpl/searches/emptystate.php b/administrator/components/com_finder/tmpl/searches/emptystate.php
@@ -16,7 +16,7 @@
 $displayData = [
     'textPrefix' => 'COM_FINDER',
     'formURL'    => 'index.php?option=com_finder&view=searches',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help4.x:Smart_Search:_Search_Term_Analysis',
+    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Smart_Search:_Search_Term_Analysis',
     'icon'       => 'icon-search',
     'title'      => Text::_('COM_FINDER_MANAGER_SEARCHES'),
     'content'    => Text::_('COM_FINDER_EMPTYSTATE_SEARCHES_CONTENT'),

diff --git a/administrator/components/com_guidedtours/tmpl/steps/emptystate.php b/administrator/components/com_guidedtours/tmpl/steps/emptystate.php
@@ -17,7 +17,7 @@
 $displayData = [
     'textPrefix' => 'COM_GUIDEDTOURS_STEPS',
     'formURL'    => 'index.php?option=com_guidedtours&view=steps',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help4.x:Guided_Tours:_Steps',
+    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Guided_Tours:_Steps',
     'icon'       => 'icon-map-signs',
 ];
 

diff --git a/administrator/components/com_guidedtours/tmpl/tours/emptystate.php b/administrator/components/com_guidedtours/tmpl/tours/emptystate.php
@@ -17,7 +17,7 @@
 $displayData = [
     'textPrefix' => 'COM_GUIDEDTOURS_TOURS_LIST',
     'formURL'    => 'index.php?option=com_guidedtours&view=tours',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help4.x:Guided_Tours',
+    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Guided_Tours',
     'icon'       => 'icon-map-signs',
 ];
 

diff --git a/administrator/components/com_installer/tmpl/discover/emptystate.php b/administrator/components/com_installer/tmpl/discover/emptystate.php
@@ -19,7 +19,7 @@
 $displayData = [
     'textPrefix' => 'COM_INSTALLER',
     'formURL'    => 'index.php?option=com_installer&task=discover.refresh',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help4.x:Extensions:_Discover',
+    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Extensions:_Discover',
     'icon'       => 'icon-puzzle-piece install',
     'createURL'  => 'index.php?option=com_installer&task=discover.refresh&' . Session::getFormToken() . '=1',
     'content'    => Text::_('COM_INSTALLER_MSG_DISCOVER_DESCRIPTION'),

diff --git a/administrator/components/com_installer/tmpl/update/emptystate.php b/administrator/components/com_installer/tmpl/update/emptystate.php
@@ -18,7 +18,7 @@
 $displayData = [
     'textPrefix' => 'COM_INSTALLER',
     'formURL'    => 'index.php?option=com_installer&view=update',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help4.x:Extensions:_Update',
+    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Extensions:_Update',
     'icon'       => 'icon-puzzle-piece install',
 ];
 

diff --git a/administrator/components/com_installer/tmpl/warnings/emptystate.php b/administrator/components/com_installer/tmpl/warnings/emptystate.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Layout\LayoutHelper;
 
 $displayData = [
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help4.x:Information:_Warnings',
+    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Information:_Warnings',
     'icon'       => 'icon-puzzle-piece install',
     'title'      => Text::_('COM_INSTALLER_MSG_WARNINGS_NONE'),
     'content'    => '',

diff --git a/...nents/com_media/resources/scripts/components/browser/actionItems/actionItemsContainer.vue b/...nents/com_media/resources/scripts/components/browser/actionItems/actionItemsContainer.vue
@@ -188,6 +188,7 @@ export default {
       return api.canDelete && (typeof this.item.canDelete !== 'undefined' ? this.item.canDelete : true);
     },
     canOpenEditView() {
+      // @TODO pass the array of allowed to edit files from PHP
       return ['jpg', 'jpeg', 'png'].includes(this.item.extension.toLowerCase());
     },
   },

diff --git a/administrator/components/com_media/resources/scripts/components/browser/table/row.vue b/administrator/components/com_media/resources/scripts/components/browser/table/row.vue
@@ -113,7 +113,7 @@ export default {
       }
 
       // @todo remove the hardcoded extensions here
-      const extensionWithPreview = ['jpg', 'jpeg', 'png', 'gif', 'webp', 'mp4', 'mp3', 'pdf'];
+      const extensionWithPreview = ['jpg', 'jpeg', 'png', 'gif', 'webp', 'avif', 'mp4', 'mp3', 'pdf'];
 
       // Show preview
       if (this.item.extension

diff --git a/administrator/components/com_media/src/Model/ApiModel.php b/administrator/components/com_media/src/Model/ApiModel.php
@@ -489,7 +489,7 @@ function ($mediaType) use (&$types) {
                     ',',
                     ComponentHelper::getParams('com_media')->get(
                         'image_extensions',
-                        'bmp,gif,jpg,jpeg,png,webp'
+                        'bmp,gif,jpg,jpeg,png,webp,avif'
                     )
                 )
             );

diff --git a/administrator/components/com_media/tmpl/file/default.php b/administrator/components/com_media/tmpl/file/default.php
@@ -45,7 +45,7 @@
     'csrfToken'          => Session::getFormToken(),
     'uploadPath'         => $this->file->path,
     'editViewUrl'        => Uri::base() . 'index.php?option=com_media&view=file' . ($tmpl ? '&tmpl=' . $tmpl : '') . '&mediatypes=' . $mediaTypes,
-    'imagesExtensions'   => array_map('trim', explode(',', $params->get('image_extensions', 'bmp,gif,jpg,jpeg,png,webp'))),
+    'imagesExtensions'   => array_map('trim', explode(',', $params->get('image_extensions', 'bmp,gif,jpg,jpeg,png,webp,avif'))),
     'audioExtensions'    => array_map('trim', explode(',', $params->get('audio_extensions', 'mp3,m4a,mp4a,ogg'))),
     'videoExtensions'    => array_map('trim', explode(',', $params->get('video_extensions', 'mp4,mp4v,mpeg,mov,webm'))),
     'documentExtensions' => array_map('trim', explode(',', $params->get('doc_extensions', 'doc,odg,odp,ods,odt,pdf,ppt,txt,xcf,xls,csv'))),

diff --git a/administrator/components/com_media/tmpl/media/default.php b/administrator/components/com_media/tmpl/media/default.php
@@ -43,7 +43,7 @@
     'fileBaseUrl'         => Uri::root() . $params->get('file_path', 'images'),
     'fileBaseRelativeUrl' => $params->get('file_path', 'images'),
     'editViewUrl'         => Uri::base() . 'index.php?option=com_media&view=file' . ($tmpl ? '&tmpl=' . $tmpl : '')  . $mediaTypes,
-    'imagesExtensions'    => array_map('trim', explode(',', $params->get('image_extensions', 'bmp,gif,jpg,jpeg,png,webp'))),
+    'imagesExtensions'    => array_map('trim', explode(',', $params->get('image_extensions', 'bmp,gif,jpg,jpeg,png,webp,avif'))),
     'audioExtensions'     => array_map('trim', explode(',', $params->get('audio_extensions', 'mp3,m4a,mp4a,ogg'))),
     'videoExtensions'     => array_map('trim', explode(',', $params->get('video_extensions', 'mp4,mp4v,mpeg,mov,webm'))),
     'documentExtensions'  => array_map('trim', explode(',', $params->get('doc_extensions', 'doc,odg,odp,ods,odt,pdf,ppt,txt,xcf,xls,csv'))),

diff --git a/administrator/components/com_menus/src/Helper/MenusHelper.php b/administrator/components/com_menus/src/Helper/MenusHelper.php
@@ -891,6 +891,14 @@ protected static function parseXmlNode($node, $replace = [])
             $params->set('menu-quicktask-permission', (string) $node['quicktask-permission']);
         }
 
+        if ($item->ajaxbadge) {
+            $params->set('ajax-badge', $item->ajaxbadge);
+        }
+
+        if ($item->dashboard) {
+            $params->set('dashboard', $item->dashboard);
+        }
+
         // Translate attributes for iterator values
         foreach ($replace as $var => $val) {
             $item->title   = str_replace("{sql:$var}", $val, $item->title);

diff --git a/administrator/components/com_menus/src/View/Menu/XmlView.php b/administrator/components/com_menus/src/View/Menu/XmlView.php
@@ -69,7 +69,7 @@ public function display($tpl = null)
             return;
         }
 
-        $this->items = $root->getChildren(true);
+        $this->items = $root->getChildren();
 
         $xml = new \SimpleXMLElement('<?xml version="1.0" encoding="UTF-8" ?><menu ' .
             'xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ' .
@@ -147,8 +147,8 @@ protected function addXmlChild($xml, $item)
             $node->addChild('params', htmlentities((string) $item->getParams(), ENT_XML1));
         }
 
-        if (isset($item->submenu)) {
-            foreach ($item->submenu as $sub) {
+        if ($item->hasChildren()) {
+            foreach ($item->getChildren() as $sub) {
                 $this->addXmlChild($node, $sub);
             }
         }

diff --git a/administrator/components/com_messages/tmpl/messages/emptystate.php b/administrator/components/com_messages/tmpl/messages/emptystate.php
@@ -17,7 +17,7 @@
 $displayData = [
     'textPrefix' => 'COM_MESSAGES',
     'formURL'    => 'index.php?option=com_messages&view=messages',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help40:Private_Messages',
+    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Private_Messages',
     'icon'       => 'icon-envelope inbox',
 ];
 

diff --git a/administrator/components/com_modules/tmpl/module/modal.php b/administrator/components/com_modules/tmpl/module/modal.php
@@ -11,6 +11,19 @@
 defined('_JEXEC') or die;
 
 /** @var \Joomla\Component\Modules\Administrator\View\Module\HtmlView $this */
+
+// A backward compatibility for bootstrap modals: hide toolbar
+// @TODO: Remove in 6.0
+$this->getDocument()->getWebAssetManager()->addInlineScript('
+if (window.parent.Joomla.Modal) {
+    const modal = window.parent.Joomla.Modal.getCurrent();
+    const toolbar = document.querySelector(".component .subhead")
+    if (modal && modal.nodeName !== "JOOMLA-DIALOG" && toolbar) {
+        toolbar.style.display = "none";
+        console.warn("Update your modal for Module editing to use Joomla Dialog");
+    }
+}
+', ['name' => 'inline.module-modal-fix'], ['type' => 'module']);
 ?>
 <div class="subhead noshadow mb-3">
     <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>

diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/emptystate.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/emptystate.php
@@ -17,7 +17,7 @@
 $displayData = [
     'textPrefix' => 'COM_NEWSFEEDS',
     'formURL'    => 'index.php?option=com_newsfeeds&view=newsfeeds',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help4.x:News_Feeds',
+    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:News_Feeds',
     'icon'       => 'icon-rss newsfeeds',
 ];
 

diff --git a/administrator/components/com_plugins/tmpl/plugin/modal.php b/administrator/components/com_plugins/tmpl/plugin/modal.php
@@ -11,6 +11,20 @@
 defined('_JEXEC') or die;
 
 /** @var \Joomla\Component\Plugins\Administrator\View\Plugin\HtmlView $this */
+
+// A backward compatibility for bootstrap modals: hide toolbar
+// @TODO: Remove in 6.0
+$this->getDocument()->getWebAssetManager()->addInlineScript('
+if (window.parent.Joomla.Modal) {
+    const modal = window.parent.Joomla.Modal.getCurrent();
+    const toolbar = document.querySelector(".component .subhead")
+    if (modal && modal.nodeName !== "JOOMLA-DIALOG" && toolbar) {
+        toolbar.style.display = "none";
+        console.warn("Update your modal for Plugin editing to use Joomla Dialog");
+    }
+}
+', ['name' => 'inline.plugin-modal-fix'], ['type' => 'module']);
+
 ?>
 <div class="subhead noshadow mb-3">
     <?php echo $this->getDocument()->getToolbar('toolbar')->render(); ?>

diff --git a/administrator/components/com_privacy/tmpl/consents/emptystate.php b/administrator/components/com_privacy/tmpl/consents/emptystate.php
@@ -15,7 +15,7 @@
 $displayData = [
     'textPrefix' => 'COM_PRIVACY_CONSENTS',
     'formURL'    => 'index.php?option=com_privacy&view=consents',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help40:Privacy:_Consents',
+    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Privacy:_Consents',
     'icon'       => 'icon-lock',
 ];
 

diff --git a/administrator/components/com_privacy/tmpl/requests/emptystate.php b/administrator/components/com_privacy/tmpl/requests/emptystate.php
@@ -16,7 +16,7 @@
 $displayData = [
     'textPrefix' => 'COM_PRIVACY_REQUESTS',
     'formURL'    => 'index.php?option=com_privacy&view=requests',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help40:Privacy:_Information_Requests',
+    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Privacy:_Information_Requests',
     'icon'       => 'icon-lock',
 ];
 

diff --git a/administrator/components/com_redirect/src/View/Links/HtmlView.php b/administrator/components/com_redirect/src/View/Links/HtmlView.php
@@ -136,7 +136,7 @@ public function display($tpl = null)
             throw new GenericDataException(implode("\n", $errors), 500);
         }
 
-        if (!(PluginHelper::isEnabled('system', 'redirect') && RedirectHelper::collectUrlsEnabled())) {
+        if (!PluginHelper::isEnabled('system', 'redirect') || !RedirectHelper::collectUrlsEnabled()) {
             $this->redirectPluginId = RedirectHelper::getRedirectPluginId();
         }
 

diff --git a/administrator/components/com_redirect/tmpl/links/default.php b/administrator/components/com_redirect/tmpl/links/default.php
@@ -14,6 +14,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\CMS\Uri\Uri;
 use Joomla\Component\Redirect\Administrator\Helper\RedirectHelper;
@@ -32,11 +33,12 @@
 $listDirn  = $this->escape($this->state->get('list.direction'));
 
 $collectUrlsEnabled = RedirectHelper::collectUrlsEnabled();
+$pluginEnabled      = PluginHelper::isEnabled('system', 'redirect');
 $redirectPluginId   = $this->redirectPluginId;
 
 // Show messages about the enabled plugin and if the plugin should collect URLs
-if (!$redirectPluginId && $collectUrlsEnabled) {
-    $app->enqueueMessage(Text::sprintf('COM_REDIRECT_COLLECT_URLS_ENABLED', Text::_('COM_REDIRECT_PLUGIN_ENABLED')), 'warning');
+if ($pluginEnabled && $collectUrlsEnabled) {
+    $app->enqueueMessage(Text::sprintf('COM_REDIRECT_COLLECT_URLS_ENABLED', Text::_('COM_REDIRECT_PLUGIN_ENABLED')), 'notice');
 } else {
     $popupOptions = [
         'popupType'  => 'iframe',
@@ -56,10 +58,10 @@
         ],
     );
 
-    if (!$redirectPluginId && !$collectUrlsEnabled) {
+    if ($pluginEnabled && !$collectUrlsEnabled) {
         $app->enqueueMessage(
             Text::sprintf('COM_REDIRECT_COLLECT_MODAL_URLS_DISABLED', Text::_('COM_REDIRECT_PLUGIN_ENABLED'), $link),
-            'warning'
+            'notice'
         );
     } else {
         $app->enqueueMessage(Text::sprintf('COM_REDIRECT_PLUGIN_MODAL_DISABLED', $link), 'error');

diff --git a/administrator/components/com_redirect/tmpl/links/emptystate.php b/administrator/components/com_redirect/tmpl/links/emptystate.php
@@ -14,6 +14,7 @@
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Layout\LayoutHelper;
+use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Router\Route;
 use Joomla\Component\Redirect\Administrator\Helper\RedirectHelper;
 
@@ -22,7 +23,7 @@
 $displayData = [
     'textPrefix' => 'COM_REDIRECT',
     'formURL'    => 'index.php?option=com_redirect&view=links',
-    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help4.x:Redirects:_Links',
+    'helpURL'    => 'https://docs.joomla.org/Special:MyLanguage/Help5.x:Redirects:_Links',
     'icon'       => 'icon-map-signs redirect',
 ];
 
@@ -42,11 +43,12 @@
 }
 
 $collectUrlsEnabled = RedirectHelper::collectUrlsEnabled();
+$pluginEnabled      = PluginHelper::isEnabled('system', 'redirect');
 $redirectPluginId   = $this->redirectPluginId;
 
 // Show messages about the enabled plugin and if the plugin should collect URLs
-if (!$redirectPluginId && $collectUrlsEnabled) {
-    $app->enqueueMessage(Text::sprintf('COM_REDIRECT_COLLECT_URLS_ENABLED', Text::_('COM_REDIRECT_PLUGIN_ENABLED')), 'warning');
+if ($pluginEnabled && $collectUrlsEnabled) {
+    $app->enqueueMessage(Text::sprintf('COM_REDIRECT_COLLECT_URLS_ENABLED', Text::_('COM_REDIRECT_PLUGIN_ENABLED')), 'notice');
 } else {
     /** @var \Joomla\CMS\WebAsset\WebAssetManager $wa */
     $wa = $this->getDocument()->getWebAssetManager();
@@ -70,10 +72,10 @@
         ],
     );
 
-    if (!$redirectPluginId && !$collectUrlsEnabled) {
+    if ($pluginEnabled && !$collectUrlsEnabled) {
         $app->enqueueMessage(
             Text::sprintf('COM_REDIRECT_COLLECT_MODAL_URLS_DISABLED', Text::_('COM_REDIRECT_PLUGIN_ENABLED'), $link),
-            'warning'
+            'notice'
         );
     } else {
         $app->enqueueMessage(Text::sprintf('COM_REDIRECT_PLUGIN_MODAL_DISABLED', $link), 'error');

diff --git a/administrator/components/com_scheduler/src/Helper/ExecRuleHelper.php b/administrator/components/com_scheduler/src/Helper/ExecRuleHelper.php
@@ -104,7 +104,8 @@ public function nextExec(bool $string = true, bool $basisNow = false)
             case 'cron-expression':
                 // @todo: testing
                 $cExp     = new CronExpression((string) $this->rule->exp);
-                $nextExec = $cExp->getNextRunDate('now', 0, false, 'UTC');
+                $nextExec = $cExp->getNextRunDate('now', 0, false, Factory::getApplication()->get('offset', 'UTC'));
+                $nextExec->setTimezone(new \DateTimeZone('UTC'));
                 $nextExec = $string ? $this->dateTimeToSql($nextExec) : $nextExec;
                 break;
             default: