Merge pull request #2901 from tobiasd/20161110-helptxt

[friendica.git] / include / plugin.php

diff --git a/include/plugin.php b/include/plugin.php
index e2bd23ee2a2ba97438ec913f80cad7abb1e44658..f6e4a7a88223e651ad5c7ec1131891338571459d 100644 (file)
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -205,37 +205,41 @@ function load_hooks() {
  * @param string $name of the hook to call
  * @param string|array &$data to transmit to the callback handler
  */
-if(! function_exists('call_hooks')) {
 function call_hooks($name, &$data = null) {
        $stamp1 = microtime(true);
 
        $a = get_app();
 
-       #logger($name, LOGGER_ALL);
-
-       if((is_array($a->hooks)) && (array_key_exists($name,$a->hooks))) {
-               foreach($a->hooks[$name] as $hook) {
-                       // 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/'.current_theme()) === false)
-                               continue;
+       if (is_array($a->hooks) && array_key_exists($name, $a->hooks))
+               foreach ($a->hooks[$name] as $hook)
+                       call_single_hook($a, $name, $hook, $data);
+}
 
-                       @include_once($hook[0]);
-                       if(function_exists($hook[1])) {
-                               $func = $hook[1];
-                               //logger($name." => ".$hook[0].":".$func."()", LOGGER_DEBUG);
-                               $func($a,$data);
-                       }
-                       else {
-                               // remove orphan hooks
-                               q("DELETE FROM `hook` WHERE `hook` = '%s' AND `file` = '%s' AND `function` = '%s'",
-                                       dbesc($name),
-                                       dbesc($hook[0]),
-                                       dbesc($hook[1])
-                               );
-                       }
-               }
+/**
+ * @brief Calls a single hook.
+ *
+ * @param string $name of the hook to call
+ * @param array $hook Hook data
+ * @param string|array &$data to transmit to the callback handler
+ */
+function call_single_hook($a, $name, $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/'.current_theme()) === false)
+               return;
+
+       @include_once($hook[0]);
+       if (function_exists($hook[1])) {
+               $func = $hook[1];
+               $func($a, $data);
+       } else {
+               // remove orphan hooks
+               q("DELETE FROM `hook` WHERE `hook` = '%s' AND `file` = '%s' AND `function` = '%s'",
+                       dbesc($name),
+                       dbesc($hook[0]),
+                       dbesc($hook[1])
+               );
        }
-}}
+}
 
 //check if an app_menu hook exist for plugin $name.
 //Return true if the plugin is an app
@@ -551,7 +555,7 @@ function theme_include($file, $root = '') {
        if($root !== '' && $root[strlen($root)-1] !== '/')
                $root = $root . '/';
        $theme_info = $a->theme_info;
-       if(array_key_exists('extends',$theme_info))
+       if(is_array($theme_info) AND array_key_exists('extends',$theme_info))
                $parent = $theme_info['extends'];
        else
                $parent = 'NOPATH';
@@ -571,4 +575,4 @@ function theme_include($file, $root = '') {
                        return $p;
        }
        return '';
-}
\ No newline at end of file
+}