Merge branch 'master' of github.com:annando/friendica

[friendica.git] / include / plugin.php

diff --git a/include/plugin.php b/include/plugin.php
index 4ff78a8b4d03feffa9725651d60b0621dabf6e28..ae8eee78a429cd38c1fc7b1a00dd07041ce7c37f 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() {
                        }
                }
        }
+
 }}
                                
 
@@ -163,6 +166,14 @@ function call_hooks($name, &$data = null) {
                                        $func = $hook[HOOK_FUNCTION];
                                        $func($a,$data);
                                }
+                               else {
+                                       // remove orphan hooks
+                                       q("delete from hook where hook = '%s' and file = '$s' and function = '%s' limit 1",
+                                               dbesc($hook[HOOK_HOOK]),
+                                               dbesc($hook[HOOK_FILE]),
+                                               dbesc($hook[HOOK_FUNCTION])
+                                       );
+                               }
                        }
                }
        }