Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 22:30:18 +00: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

11
src/Core/Hook.php
View file

@ -167,7 +167,7 @@ class Hook
if ($hook[0] != $fork_hook[0]) {
continue;
}
self::callSingle(DI::app(), 'hook_fork', $fork_hook, $hookdata);
self::callSingle('hook_fork', $fork_hook, $hookdata);
}
if (!$hookdata['execute']) {
@ -195,7 +195,7 @@ class Hook
{
if (array_key_exists($name, self::$hooks)) {
foreach (self::$hooks[$name] as $hook) {
self::callSingle(DI::app(), $name, $hook, $data);
self::callSingle($name, $hook, $data);
}
}
}
@ -203,24 +203,23 @@ class Hook
/**
* Calls a single hook.
*
* @param App $a
* @param string $name of the hook to call
* @param array $hook Hook data
* @param string|array &$data to transmit to the callback handler
* @return void
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public static function callSingle(App $a, string $name, array $hook, &$data = null)
public static function callSingle(string $name, array $hook, &$data = null)
{
// Don't run a theme's hook if the user isn't using the theme
if (strpos($hook[0], 'view/theme/') !== false && strpos($hook[0], 'view/theme/' . $a->getCurrentTheme()) === false) {
if (strpos($hook[0], 'view/theme/') !== false && strpos($hook[0], 'view/theme/' . DI::app()->getCurrentTheme()) === false) {
return;
}
@include_once($hook[0]);
if (function_exists($hook[1])) {
$func = $hook[1];
$func($a, $data);
$func($data);
} else {
// remove orphan hooks
$condition = ['hook' => $name, 'file' => $hook[0], 'function' => $hook[1]];