diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2011-10-02 11:18:55 -0700 |
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2011-10-02 11:18:55 -0700 |
| commit | 58b66643c1921706d764b2bb1ea4729519ca31f8 (patch) | |
| tree | 1154a0ecf822ba81f2751cfe805024d943d032f6 /actions/admin/plugins/deactivate.php | |
| parent | dd55b4b87cb1c89ceeb45ccf49ce648339a86041 (diff) | |
| download | elgg-58b66643c1921706d764b2bb1ea4729519ca31f8.tar.gz elgg-58b66643c1921706d764b2bb1ea4729519ca31f8.tar.bz2 | |
Fixes #3915. Added ElggPlugin->getFriendlyName() to check for manifest->getName() first, then for plugin ID. Added better descriptions for plugin activation errors.
Diffstat (limited to 'actions/admin/plugins/deactivate.php')
| -rw-r--r-- | actions/admin/plugins/deactivate.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actions/admin/plugins/deactivate.php b/actions/admin/plugins/deactivate.php index f5eca3aaa..2ce796eff 100644 --- a/actions/admin/plugins/deactivate.php +++ b/actions/admin/plugins/deactivate.php @@ -28,7 +28,9 @@ foreach ($plugin_guids as $guid) { if ($plugin->deactivate()) { //system_message(elgg_echo('admin:plugins:deactivate:yes', array($plugin->getManifest()->getName()))); } else { - register_error(elgg_echo('admin:plugins:deactivate:no', array($plugin->getManifest()->getName()))); + $msg = $plugin->getError(); + $string = ($msg) ? 'admin:plugins:deactivate:no_with_msg' : 'admin:plugins:deactivate:no'; + register_error(elgg_echo($string, array($plugin->getFriendlyName(), $plugin->getError()))); } } |