Merge branch '5.1-dev' into fix-43344

joomla · May 11, 2024 · 50dcc6f · 50dcc6f
2 parents 92a9ef1 + 9976a6e
commit 50dcc6f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
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;
 
@@ -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->document->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/language/en-GB/com_cpanel.ini b/administrator/language/en-GB/com_cpanel.ini
@@ -30,6 +30,6 @@ COM_CPANEL_MSG_TEXTFILTER3919_TITLE="Updated Text Filter Recommendations"
 COM_CPANEL_TITLE_SYSTEM_PANEL="System Panel"
 COM_CPANEL_UNPUBLISH_MODULE_ERROR="Error unpublishing the module"
 COM_CPANEL_UNPUBLISH_MODULE_SUCCESS="Module unpublished"
-COM_CPANEL_WELCOME_BEGINNERS_MESSAGE="<p>Community resources are available for new users.</p><ul><li><a href=\"https://docs.joomla.org/Special:MyLanguage/Portal:Beginners\" target=\"_blank\" rel=\"noopener noreferrer\">Joomla! Beginners Guide</a></li><li><a href=\"https://forum.joomla.org/viewforum.php?f=808\" target=\"_blank\" rel=\"noopener noreferrer\">New to Joomla! Forum</a></li></ul>"
+COM_CPANEL_WELCOME_BEGINNERS_MESSAGE="<p>Community resources are available for new users.</p><ul><li><a href=\"https://docs.joomla.org/Special:MyLanguage/Portal:Beginners\" target=\"_blank\" rel=\"noopener noreferrer\">Joomla! Beginners Guide</a></li><li><a href=\"https://forum.joomla.org/viewforum.php?f=834\" target=\"_blank\" rel=\"noopener noreferrer\">New to Joomla! Forum</a></li></ul>"
 COM_CPANEL_WELCOME_BEGINNERS_TITLE="Welcome to Joomla!"
 COM_CPANEL_XML_DESCRIPTION="Home Dashboard component"