aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/network.php9
-rwxr-xr-xinclude/plugin.php6
-rw-r--r--include/text.php2
3 files changed, 8 insertions, 9 deletions
diff --git a/include/network.php b/include/network.php
index 062f2c2bf..41d13a40e 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1992,14 +1992,7 @@ function get_site_info() {
else
$service_class = false;
- $visible_plugins = array();
- if(is_array(App::$plugins) && count(App::$plugins)) {
- $r = q("select * from addon where hidden = 0");
- if(count($r))
- foreach($r as $rr)
- $visible_plugins[] = $rr['aname'];
- }
- sort($visible_plugins);
+ $visible_plugins = visible_plugin_list();
if(@is_dir('.git') && function_exists('shell_exec'))
$commit = trim(@shell_exec('git log -1 --format="%h"'));
diff --git a/include/plugin.php b/include/plugin.php
index 9b84039a6..c95f8cbf9 100755
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -167,6 +167,12 @@ function reload_plugins() {
}
}
+function visible_plugin_list() {
+ $r = q("select * from addon where hidden = 0 order by aname asc");
+ return(($r) ? ids_to_array($r,'aname') : array());
+}
+
+
/**
* @brief registers a hook.
diff --git a/include/text.php b/include/text.php
index 22f4556a8..3754675d1 100644
--- a/include/text.php
+++ b/include/text.php
@@ -2050,7 +2050,7 @@ function ids_to_array($arr,$idx = 'id') {
$t = array();
if($arr) {
foreach($arr as $x) {
- if(! in_array($x[$idx],$t)) {
+ if(strlen($x[$idx]) && (! in_array($x[$idx],$t))) {
$t[] = $x[$idx];
}
}