[6.0] Restore onBeforeExecute event for CMSApplication (#45426)

* Restore onBeforeExecute for CMS application

* Restore onBeforeExecute for CMS application

---------

Co-authored-by: Richard Fath <[email protected]>
Co-authored-by: Phil Walton <[email protected]>

Author: 3 people

libraries/src/Application/CMSApplication.php

@@ -17,6 +17,7 @@
 use Joomla\CMS\Event\Application\AfterRenderEvent;
 use Joomla\CMS\Event\Application\AfterRespondEvent;
 use Joomla\CMS\Event\Application\AfterRouteEvent;
+use Joomla\CMS\Event\Application\BeforeExecuteEvent;
 use Joomla\CMS\Event\Application\BeforeRenderEvent;
 use Joomla\CMS\Event\Application\BeforeRespondEvent;
 use Joomla\CMS\Event\ErrorEvent;
@@ -300,6 +301,16 @@ public function execute()
             $this->setupLogging();
             $this->createExtensionNamespaceMap();
 
+            // Trigger the onBeforeExecute event
+            PluginHelper::importPlugin('system', null, true, $this->getDispatcher());
+            $this->dispatchEvent(
+                'onBeforeExecute',
+                new BeforeExecuteEvent('onBeforeExecute', ['subject' => $this, 'container' => $this->getContainer()])
+            );
+
+            // Mark beforeExecute in the profiler.
+            JDEBUG ? $this->profiler->mark('beforeExecute event dispatched') : null;
+
             // Perform application routines.
             $this->doExecute();
 
@@ -809,7 +820,6 @@ protected function initialiseApp($options = [])
         PluginHelper::importPlugin('behaviour', null, true, $this->getDispatcher());
 
         // Trigger the onAfterInitialise event.
-        PluginHelper::importPlugin('system', null, true, $this->getDispatcher());
         $this->dispatchEvent(
             'onAfterInitialise',
             new AfterInitialiseEvent('onAfterInitialise', ['subject' => $this])

libraries/src/Application/SiteApplication.php

@@ -570,12 +570,6 @@ protected function initialiseApp($options = [])
             $user->groups   = [$guestUsergroup];
         }
 
-        if ($plugin = PluginHelper::getPlugin('system', 'languagefilter')) {
-            $pluginParams = new Registry($plugin->params);
-            $this->setLanguageFilter(true);
-            $this->setDetectBrowser($pluginParams->get('detect_browser', 1) == 1);
-        }
-
         if (empty($options['language'])) {
             // Detect the specified language
             $lang = $this->input->getString('language', null);

plugins/system/languagefilter/src/Extension/LanguageFilter.php

@@ -17,6 +17,7 @@
 use Joomla\CMS\Event\Application\AfterDispatchEvent;
 use Joomla\CMS\Event\Application\AfterInitialiseEvent;
 use Joomla\CMS\Event\Application\AfterRouteEvent;
+use Joomla\CMS\Event\Application\BeforeExecuteEvent;
 use Joomla\CMS\Event\Privacy\CollectCapabilitiesEvent;
 use Joomla\CMS\Event\User\AfterSaveEvent;
 use Joomla\CMS\Event\User\BeforeSaveEvent;
@@ -186,6 +187,7 @@ public static function getSubscribedEvents(): array
          * might be needed by other plugins
          */
         return [
+            'onBeforeExecute'                   => 'onBeforeExecute',
             'onAfterInitialise'                 => 'onAfterInitialise',
             'onAfterDispatch'                   => 'onAfterDispatch',
             'onAfterRoute'                      => 'onAfterRoute',
@@ -196,6 +198,28 @@ public static function getSubscribedEvents(): array
         ];
     }
 
+    /**
+     * Listener for the onBeforeExecute event
+     *
+     * @param   BeforeExecuteEvent  $event  The Event object
+     *
+     * @return  void
+     *
+     * @since   __DEPLOY_VERSION__
+     */
+    public function onBeforeExecute(BeforeExecuteEvent $event): void
+    {
+        $app = $event->getApplication();
+
+        if (!$app->isClient('site')) {
+            return;
+        }
+
+        // If a language was specified it has priority, otherwise use user or default language settings
+        $app->setLanguageFilter(true);
+        $app->setDetectBrowser($this->params->get('detect_browser', '1') == '1');
+    }
+
     /**
      * After initialise.
      *