Call App::load() on App::processConsole() and procesEjabberd()

diff --git a/bin/auth_ejabberd.php b/bin/auth_ejabberd.php
index bc976e61a436fefc7890e56a2c2530210c6ab8ed..595ccf204ab7e614558f81334484357df614606b 100755 (executable)
--- a/bin/auth_ejabberd.php
+++ b/bin/auth_ejabberd.php
@@ -52,4 +52,4 @@ $container = \Friendica\Core\DiceContainer::fromBasePath(dirname(__DIR__));
 
 $app = \Friendica\App::fromContainer($container);
 
-$app->processEjabberd();
+$app->processEjabberd($_SERVER);

diff --git a/src/App.php b/src/App.php
index 6bdb20d45c957bfb51e66ec16f85630821e9a891..d622eacbb5684c6c10c451853651968150fd4461 100644 (file)
--- a/src/App.php
+++ b/src/App.php
@@ -194,12 +194,22 @@ class App
 
                $this->registerErrorHandler();
 
+               $this->load(
+                       $serverParams,
+                       $this->container->create(DbaDefinition::class),
+                       $this->container->create(ViewDefinition::class),
+                       $this->container->create(Mode::class),
+                       $this->container->create(IManageConfigValues::class),
+                       $this->container->create(Profiler::class),
+                       $this->container->create(AppHelper::class),
+               );
+
                $this->registerTemplateEngine();
 
                (\Friendica\Core\Console::create($this->container, $argv))->execute();
        }
 
-       public function processEjabberd(): void
+       public function processEjabberd(array $serverParams): void
        {
                $this->setupContainerForAddons();
 
@@ -209,6 +219,16 @@ class App
 
                $this->registerErrorHandler();
 
+               $this->load(
+                       $serverParams,
+                       $this->container->create(DbaDefinition::class),
+                       $this->container->create(ViewDefinition::class),
+                       $this->container->create(Mode::class),
+                       $this->container->create(IManageConfigValues::class),
+                       $this->container->create(Profiler::class),
+                       $this->container->create(AppHelper::class),
+               );
+
                /** @var BasePath */
                $basePath = $this->container->create(BasePath::class);