Merge remote-tracking branch 'upstream/develop' into audience

[friendica.git] / src / Module / Settings / Addons.php

diff --git a/src/Module/Settings/Addons.php b/src/Module/Settings/Addons.php
index ac2d188c0a5bae2bb0cbebdf10e9455b6ca0cae9..b6ac406ba6ebc19cc8039cf5f62f89c80fee2d13 100644 (file)
--- a/src/Module/Settings/Addons.php
+++ b/src/Module/Settings/Addons.php
@@ -36,15 +36,12 @@ class Addons extends BaseSettings
 {
        /** @var Database */
        private $database;
-       /** @var App */
-       private $app;
 
-       public function __construct(App $app, Database $database, IHandleUserSessions $session, App\Page $page, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(Database $database, IHandleUserSessions $session, App\Page $page, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
                parent::__construct($session, $page, $l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->database = $database;
-               $this->app      = $app;
        }
 
        protected function post(array $request = [])
@@ -62,7 +59,7 @@ class Addons extends BaseSettings
                $addon_settings_forms = [];
                foreach ($this->database->selectToArray('hook', ['file', 'function'], ['hook' => 'addon_settings']) as $hook) {
                        $data = [];
-                       Hook::callSingle($this->app, 'addon_settings', [$hook['file'], $hook['function']], $data);
+                       Hook::callSingle('addon_settings', [$hook['file'], $hook['function']], $data);
 
                        if (!empty($data['href'])) {
                                $tpl                    = Renderer::getMarkupTemplate('settings/addons/link.tpl');