Merge pull request #351 from annando/master

[friendica.git] / include / plugin.php

diff --git a/include/plugin.php b/include/plugin.php
index 4ff78a8b4d03feffa9725651d60b0621dabf6e28..c6b61ae6e92fe45a54920cfa5faf672a34c2e95b 100644 (file)
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -70,8 +70,10 @@ function reload_plugins() {
                        $installed = array();
 
                $parr = explode(',',$plugins);
+
                if(count($parr)) {
                        foreach($parr as $pl) {
+
                                $pl = trim($pl);
 
                                $fname = 'addon/' . $pl . '/' . $pl . '.php';
@@ -101,6 +103,7 @@ function reload_plugins() {
                        }
                }
        }
+
 }}
                                
 
@@ -145,7 +148,9 @@ function load_hooks() {
        $r = q("SELECT * FROM `hook` WHERE 1");
        if(count($r)) {
                foreach($r as $rr) {
-                       $a->hooks[] = array($rr['hook'], $rr['file'], $rr['function']);
+                       if(! array_key_exists($rr['hook'],$a->hooks))
+                               $a->hooks[$rr['hook']] = array();
+                       $a->hooks[$rr['hook']][] = array($rr['file'],$rr['function']);
                }
        }
 }}
@@ -155,17 +160,24 @@ if(! function_exists('call_hooks')) {
 function call_hooks($name, &$data = null) {
        $a = get_app();
 
-       if(count($a->hooks)) {
-               foreach($a->hooks as $hook) {
-                       if($hook[HOOK_HOOK] === $name) {
-                               @include_once($hook[HOOK_FILE]);
-                               if(function_exists($hook[HOOK_FUNCTION])) {
-                                       $func = $hook[HOOK_FUNCTION];
-                                       $func($a,$data);
-                               }
+       if((is_array($a->hooks)) && (array_key_exists($name,$a->hooks))) {
+               foreach($a->hooks[$name] as $hook) {
+                       @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' limit 1",
+                                       dbesc($name),
+                                       dbesc($hook[0]),
+                                       dbesc($hook[1])
+                               );
                        }
                }
        }
+
 }}