summaryrefslogtreecommitdiff
path: root/actions/pluginsadminpanel.php
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2010-11-20 22:02:31 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2010-11-20 22:02:31 -0500
commit3a336843e1cdd340dd3630747b3e6265b6effa39 (patch)
tree77643c2438808bae2ac5f6f6742f548108044c5c /actions/pluginsadminpanel.php
parent0d4588e4b62ecd3ec22d2928dce5e036e3322b77 (diff)
Add more robust (but backward-compatible) plugin config system.
util.php: add common_config_section($main), as a companion to common_config($main,sub) statusnet.php: * add public static getPlugins(), which returns array_merge(common_config('plugins','default'),common_config_section('plugin-list')) * use self::getPlugins(), instead of common_config('plugins,'default') * handle plugins that have a type other than "array" or "null" for parameters pluginenable: * use StatusNet::getPlugins() instead of common_config('plugins,'default') * set $config['plugin-list'][$plugin_name] = 1 pluginsadminpanel: use StatusNet::getPlugins() instead of common_config('plugins,'default')
Diffstat (limited to 'actions/pluginsadminpanel.php')
-rw-r--r--actions/pluginsadminpanel.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/pluginsadminpanel.php b/actions/pluginsadminpanel.php
index bc400bd51..c1f4fe253 100644
--- a/actions/pluginsadminpanel.php
+++ b/actions/pluginsadminpanel.php
@@ -95,7 +95,7 @@ class PluginsadminpanelAction extends AdminPanelAction
*/
protected function showDefaultPlugins()
{
- $plugins = array_keys(common_config('plugins', 'default'));
+ $plugins = array_keys(StatusNet::getPlugins());
natsort($plugins);
if ($plugins) {