messages.po and and corrected typo in comment

[friendica.git] / src / App.php

diff --git a/src/App.php b/src/App.php
index d4120bcc2de922a265f3978bb095d97d6b22e3a7..eb0d1cc2176e1a258c6baf1dc2b311230ebf8b2d 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -27,6 +27,8 @@ use Friendica\App\BaseURL;
 use Friendica\Capabilities\ICanCreateResponses;
 use Friendica\Core\Config\Factory\Config;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
+use Friendica\Database\Definition\DbaDefinition;
+use Friendica\Database\Definition\ViewDefinition;
 use Friendica\Model\User;
 use Friendica\Module\Maintenance;
 use Friendica\Security\Authentication;
@@ -62,7 +64,7 @@ class App
 {
        const PLATFORM = 'Friendica';
        const CODENAME = 'Giant Rhubarb';
-       const VERSION  = '2022.12-rc';
+       const VERSION  = '2023.03-dev';
 
        // Allow themes to control internal parameters
        // by changing App values in theme.php
@@ -337,27 +339,29 @@ class App
         * @param App\Arguments               $args     The Friendica Arguments of the call
         * @param IManagePersonalConfigValues $pConfig  Personal configuration
         * @param IHandleUserSessions         $session  The (User)Session handler
+        * @param DbaDefinition               $dbaDefinition
+        * @param ViewDefinition              $viewDefinition
         */
-       public function __construct(Database $database, IManageConfigValues $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, IManagePersonalConfigValues $pConfig, IHandleUserSessions $session)
+       public function __construct(Database $database, IManageConfigValues $config, App\Mode $mode, BaseURL $baseURL, LoggerInterface $logger, Profiler $profiler, L10n $l10n, Arguments $args, IManagePersonalConfigValues $pConfig, IHandleUserSessions $session, DbaDefinition $dbaDefinition, ViewDefinition $viewDefinition)
        {
-               $this->database = $database;
-               $this->config   = $config;
-               $this->mode     = $mode;
-               $this->baseURL  = $baseURL;
-               $this->profiler = $profiler;
-               $this->logger   = $logger;
-               $this->l10n     = $l10n;
-               $this->args     = $args;
-               $this->pConfig  = $pConfig;
-               $this->session  = $session;
+               $this->database       = $database;
+               $this->config         = $config;
+               $this->mode           = $mode;
+               $this->baseURL        = $baseURL;
+               $this->profiler       = $profiler;
+               $this->logger         = $logger;
+               $this->l10n           = $l10n;
+               $this->args           = $args;
+               $this->pConfig        = $pConfig;
+               $this->session        = $session;
 
-               $this->load();
+               $this->load($dbaDefinition, $viewDefinition);
        }
 
        /**
         * Load the whole app instance
         */
-       public function load()
+       protected function load(DbaDefinition $dbaDefinition, ViewDefinition $viewDefinition)
        {
                set_time_limit(0);
 
@@ -386,6 +390,10 @@ class App
                        Core\Hook::loadHooks();
                        $loader = (new Config())->createConfigFileLoader($this->getBasePath(), $_SERVER);
                        Core\Hook::callAll('load_config', $loader);
+
+                       // Hooks are now working, reload the whole definitions with hook enabled
+                       $dbaDefinition->load(true);
+                       $viewDefinition->load(true);
                }
 
                $this->loadDefaultTimezone();
@@ -717,10 +725,6 @@ class App
                                $this->baseURL->redirect('search');
                        }
 
-                       if (in_array($moduleName, ['about', 'about/more'])) {
-                               $this->baseURL->redirect('friendica');
-                       }
-
                        // Initialize module that can set the current theme in the init() method, either directly or via App->setProfileOwner
                        $page['page_title'] = $moduleName;