diff options
author | Michael Vogel <icarus@dabo.de> | 2012-05-09 14:56:48 +0200 |
---|---|---|
committer | Michael Vogel <icarus@dabo.de> | 2012-05-09 14:56:48 +0200 |
commit | f2e648d62fe7cafb9a55c7505687ea4d1c294778 (patch) | |
tree | 07a1b31339ccd871bb4fbfe73e3f0d4911689795 /mod/friendica.php | |
parent | a3f08c44be78d4517e9f1619811def09b2ec7e7a (diff) | |
parent | 53157bb954acb7597347c6b4a87e64e7a2f6cc79 (diff) | |
download | volse-hubzilla-f2e648d62fe7cafb9a55c7505687ea4d1c294778.tar.gz volse-hubzilla-f2e648d62fe7cafb9a55c7505687ea4d1c294778.tar.bz2 volse-hubzilla-f2e648d62fe7cafb9a55c7505687ea4d1c294778.zip |
Merge remote branch 'upstream/master'
Diffstat (limited to 'mod/friendica.php')
-rw-r--r-- | mod/friendica.php | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/mod/friendica.php b/mod/friendica.php index 52a064224..28807b5b5 100644 --- a/mod/friendica.php +++ b/mod/friendica.php @@ -18,10 +18,18 @@ function friendica_init(&$a) { $admin = false; } + $visible_plugins = array(); + if(is_array($a->plugins) && count($a->plugins)) { + $r = q("select * from addon where hidden = 0"); + if(count($r)) + foreach($r as $rr) + $visible_plugins[] = $rr['name']; + } + $data = Array( 'version' => FRIENDICA_VERSION, 'url' => z_root(), - 'plugins' => $a->plugins, + 'plugins' => $visible_plugins, 'register_policy' => $register_policy[$a->config['register_policy']], 'admin' => $admin, 'site_name' => $a->config['sitename'], @@ -54,9 +62,18 @@ function friendica_content(&$a) { $o .= '<p></p>'; - if(count($a->plugins)) { + $visible_plugins = array(); + if(is_array($a->plugins) && count($a->plugins)) { + $r = q("select * from addon where hidden = 0"); + if(count($r)) + foreach($r as $rr) + $visible_plugins[] = $rr['name']; + } + + + if(count($visible_plugins)) { $o .= '<p>' . t('Installed plugins/addons/apps:') . '</p>'; - $sorted = $a->plugins; + $sorted = $visible_plugins; $s = ''; sort($sorted); foreach($sorted as $p) { |