clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Sorting plugins after priority and name (better for the configuration page)

This commit is contained in:
Michael Vogel 2013-12-02 20:28:30 +01:00
parent e875a104ce
commit 1d19e056e7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/plugin.php
View File

@ -80,7 +80,7 @@ function reload_plugins() {
if(file_exists($fname)) { if(file_exists($fname)) {
$t = @filemtime($fname); $t = @filemtime($fname);
foreach($installed as $i) { foreach($installed as $i) {
if(($i['name'] == $pl) && ($i['timestamp'] != $t)) { if(($i['name'] == $pl) && ($i['timestamp'] != $t)) {
logger('Reloading plugin: ' . $i['name']); logger('Reloading plugin: ' . $i['name']);
@include_once($fname); @include_once($fname);
@ -145,7 +145,7 @@ if(! function_exists('load_hooks')) {
function load_hooks() { function load_hooks() {
$a = get_app(); $a = get_app();
$a->hooks = array(); $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)) { if(count($r)) {
foreach($r as $rr) { foreach($r as $rr) {
if(! array_key_exists($rr['hook'],$a->hooks)) if(! array_key_exists($rr['hook'],$a->hooks))