From 2c438e9ecc3d3cb5191921d03ab343f4c5f53cc6 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 21 Nov 2010 00:46:01 -0500 Subject: Check if a plugin _exists_, not whether it is loaded, when enabling/disabling it. (Needed for previous commit to be useful) pluginenable.php: check if a file exists, not if it's been loaded. --- actions/pluginenable.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/actions/pluginenable.php b/actions/pluginenable.php index 826874ae5..4662f4368 100644 --- a/actions/pluginenable.php +++ b/actions/pluginenable.php @@ -104,8 +104,14 @@ class PluginEnableAction extends Action } $this->plugin = $this->arg('plugin'); - $pluginList = StatusNet::getPlugins(); - if (!array_key_exists($this->plugin, $pluginList)) { + $files = StatusNet::pluginFiles($this->plugin); + $found = false; + foreach ($files as $file) { + if (file_exists($file)) { + $found = true; + } + } + if (!$found) { $this->clientError(_('No such plugin.')); return false; } -- cgit v1.2.3-54-g00ecf