Better handling of the network field in the item table.

[friendica.git] / include / plugin.php

diff --git a/include/plugin.php b/include/plugin.php
index a706dcf51c81a44a4372b8fa3376881e1f8cfcde..32962cd0c6e8882823fab6260e0f8cf0dcf8942a 100644 (file)
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -80,7 +80,7 @@ function reload_plugins() {
                                if(file_exists($fname)) {
                                        $t = @filemtime($fname);
                                        foreach($installed as $i) {
-                                               if(($i['name'] == $pl) && ($i['timestamp'] != $t)) {    
+                                               if(($i['name'] == $pl) && ($i['timestamp'] != $t)) {
                                                        logger('Reloading plugin: ' . $i['name']);
                                                        @include_once($fname);
 
@@ -145,7 +145,7 @@ 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");
+       $r = q("SELECT * FROM `hook` WHERE 1 ORDER BY `priority` DESC, `file`");
        if(count($r)) {
                foreach($r as $rr) {
                        if(! array_key_exists($rr['hook'],$a->hooks))
@@ -328,10 +328,10 @@ function get_theme_info($theme){
                                                $info[$k]=$v;
                                        }
                                }
-                               
+
                        }
                }
-               
+
        }
        return $info;
 }}
@@ -351,7 +351,7 @@ function get_theme_screenshot($theme) {
 if (! function_exists('uninstall_theme')){
 function uninstall_theme($theme){
        logger("Addons: uninstalling theme " . $theme);
-    
+
        @include_once("view/theme/$theme/theme.php");
        if(function_exists("{$theme}_uninstall")) {
                $func = "{$theme}_uninstall";