aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Siteinfo.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-06-21 10:08:49 +0200
committerMario Vavti <mario@mariovavti.com>2016-06-21 10:08:49 +0200
commitecae0b3d97d759603bb2bf9bc51187a2842964c8 (patch)
treef91d7d8efdd3c0ba1b7eeb59ac4555d0bff8aafe /Zotlabs/Module/Siteinfo.php
parentda2c0a22f9763621e44a6614627034c9789d7639 (diff)
parent63423c8ee1f750d855c75ed67205076d21eda4f1 (diff)
downloadvolse-hubzilla-ecae0b3d97d759603bb2bf9bc51187a2842964c8.tar.gz
volse-hubzilla-ecae0b3d97d759603bb2bf9bc51187a2842964c8.tar.bz2
volse-hubzilla-ecae0b3d97d759603bb2bf9bc51187a2842964c8.zip
Merge branch 'dev' into sabre32
Diffstat (limited to 'Zotlabs/Module/Siteinfo.php')
-rw-r--r--Zotlabs/Module/Siteinfo.php27
1 files changed, 5 insertions, 22 deletions
diff --git a/Zotlabs/Module/Siteinfo.php b/Zotlabs/Module/Siteinfo.php
index 41f6e9f0b..a15e2896d 100644
--- a/Zotlabs/Module/Siteinfo.php
+++ b/Zotlabs/Module/Siteinfo.php
@@ -27,28 +27,11 @@ class Siteinfo extends \Zotlabs\Web\Controller {
else {
$version = $commit = '';
}
- $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['name'];
- }
-
- $plugins_list = '';
- if(count($visible_plugins)) {
- $plugins_text = t('Installed plugins/addons/apps:');
- $sorted = $visible_plugins;
- $s = '';
- sort($sorted);
- foreach($sorted as $p) {
- if(strlen($p)) {
- if(strlen($s)) $s .= ', ';
- $s .= $p;
- }
- }
- $plugins_list .= $s;
- }
+
+ $plugins_list = implode(', ',visible_plugin_list());
+
+ if($plugins_list)
+ $plugins_text = t('Installed plugins/addons/apps:');
else
$plugins_text = t('No installed plugins/addons/apps');