Merge pull request #1070 from annando/master

[friendica.git] / include / plugin.php

diff --git a/include/plugin.php b/include/plugin.php
index a706dcf51c81a44a4372b8fa3376881e1f8cfcde..f4861536c10726e6ff8b857d73872e49b61c4925 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))
@@ -197,14 +197,14 @@ function plugin_is_app($name) {
                                return true;
                }
        }
-       
+
        return false;
 }}
 
 /*
  * parse plugin comment in search of plugin infos.
  * like
- *     
+ *
  *      * Name: Plugin
  *   * Description: A plugin which plugs in
  *      * Version: 1.2.3
@@ -222,7 +222,8 @@ function get_plugin_info($plugin){
                'name' => $plugin,
                'description' => "",
                'author' => array(),
-               'version' => ""
+               'version' => "",
+               'status' => ""
        );
 
        if (!is_file("addon/$plugin/$plugin.php")) return $info;
@@ -328,10 +329,10 @@ function get_theme_info($theme){
                                                $info[$k]=$v;
                                        }
                                }
-                               
+
                        }
                }
-               
+
        }
        return $info;
 }}
@@ -351,7 +352,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";