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 /engine/classes/ElggPluginPackage.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 'engine/classes/ElggPluginPackage.php')
| -rw-r--r-- | engine/classes/ElggPluginPackage.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/engine/classes/ElggPluginPackage.php b/engine/classes/ElggPluginPackage.php index 02b985285..145f71fcd 100644 --- a/engine/classes/ElggPluginPackage.php +++ b/engine/classes/ElggPluginPackage.php @@ -347,6 +347,7 @@ class ElggPluginPackage { $conflict['name'] = $plugin->getManifest()->getName(); if (!$full_report && !$result['status']) { + $this->errorMsg = "Conflicts with plugin \"{$plugin->getManifest()->getName()}\"."; return $result['status']; } else { $report[] = array( @@ -399,6 +400,7 @@ class ElggPluginPackage { // unless we're doing a full report, break as soon as we fail. if (!$full_report && !$result['status']) { + $this->errorMsg = "Missing dependencies."; return $result['status']; } else { // build report element and comment |