diff options
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/pluginenable.php | 5 | ||||
| -rw-r--r-- | actions/pluginsadminpanel.php | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/actions/pluginenable.php b/actions/pluginenable.php index 2dbb3e395..826874ae5 100644 --- a/actions/pluginenable.php +++ b/actions/pluginenable.php @@ -104,8 +104,8 @@ class PluginEnableAction extends Action } $this->plugin = $this->arg('plugin'); - $defaultPlugins = common_config('plugins', 'default'); - if (!array_key_exists($this->plugin, $defaultPlugins)) { + $pluginList = StatusNet::getPlugins(); + if (!array_key_exists($this->plugin, $pluginList)) { $this->clientError(_('No such plugin.')); return false; } @@ -127,6 +127,7 @@ class PluginEnableAction extends Action { $key = 'disable-' . $this->plugin; Config::save('plugins', $key, $this->overrideValue()); + Config::save('plugin-list', $this->plugin, 1); // @fixme this is a pretty common pattern and should be refactored down if ($this->boolean('ajax')) { 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) { |