Modifed "update" and "insert" function / many changed queries

[friendica.git] / include / plugin.php

diff --git a/include/plugin.php b/include/plugin.php
index f5f0bb2b294f21ca6126bd46a5b5bdb755f6c060..60ef6138b9c4712145fb3c69ecf9d2e7c574936f 100644 (file)
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -183,20 +183,18 @@ function unregister_hook($hook,$file,$function) {
 }}
 
 
-if (! function_exists('load_hooks')) {
 function load_hooks() {
        $a = get_app();
        $a->hooks = array();
-       $r = q("SELECT * FROM `hook` WHERE 1 ORDER BY `priority` DESC, `file`");
+       $r = dba::select('hook', array('hook', 'file', 'function'), array(), array('order' => array('priority' => 'desc', 'file')));
 
-       if (dbm::is_result($r)) {
-               foreach ($r as $rr) {
-                       if (! array_key_exists($rr['hook'],$a->hooks))
-                               $a->hooks[$rr['hook']] = array();
-                       $a->hooks[$rr['hook']][] = array($rr['file'],$rr['function']);
+       while ($rr = dba::fetch($r)) {
+               if (! array_key_exists($rr['hook'],$a->hooks)) {
+                       $a->hooks[$rr['hook']] = array();
                }
+               $a->hooks[$rr['hook']][] = array($rr['file'],$rr['function']);
        }
-}}
+}
 
 /**
  * @brief Calls a hook.