Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-07 23:44:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove App dependency from Hook::callSingle

Browse source 
- This was causing a circular dependency with the logger_instance hook
This commit is contained in:
Hypolite Petovan 2023-01-13 21:10:59 -05:00
parent 79d1506694
commit e73adde5fb
8 changed files with 37 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/Module/Settings/Addons.php
View file

@ -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');