Merge pull request #6400 from annando/issue-6394

[friendica.git] / src / Core / Hook.php

diff --git a/src/Core/Hook.php b/src/Core/Hook.php
index 73aa95ee908197c3cbc77ebc051ebe9fb7d794e6..2d6c945067965263e45f6a2b879602615e76facd 100644 (file)
--- a/src/Core/Hook.php
+++ b/src/Core/Hook.php
@@ -137,19 +137,19 @@ class Hook extends BaseObject
                if (array_key_exists($name, self::$hooks)) {
                        foreach (self::$hooks[$name] as $hook) {
                                // Call a hook to check if this hook call needs to be forked
-                               $hookdata = ['name' => $name, 'data' => $data, 'execute' => true];
-
                                if (array_key_exists('hook_fork', self::$hooks)) {
+                                       $hookdata = ['name' => $name, 'data' => $data, 'execute' => true];
+
                                        foreach (self::$hooks['hook_fork'] as $fork_hook) {
                                                if ($hook[0] != $fork_hook[0]) {
                                                        continue;
                                                }
                                                self::callSingle(self::getApp(), 'hook_fork', $fork_hook, $hookdata);
                                        }
-                               }
 
-                               if (!$hookdata['execute']) {
-                                       continue;
+                                       if (!$hookdata['execute']) {
+                                               continue;
+                                       }
                                }
 
                                Worker::add($priority, 'ForkHook', $name, $hook, $data);