diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2011-08-27 10:41:35 -0700 |
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2011-08-27 10:41:35 -0700 |
| commit | 0179e8c68b0827d77c61a31c8c0d6bf4a277c785 (patch) | |
| tree | 5899e1172afcbfcfe642b14afd76183f93736ad4 /engine/classes/ElggPluginPackage.php | |
| parent | 79bc4476464e53d38a36f59f9a438f7592215951 (diff) | |
| download | elgg-0179e8c68b0827d77c61a31c8c0d6bf4a277c785.tar.gz elgg-0179e8c68b0827d77c61a31c8c0d6bf4a277c785.tar.bz2 | |
Fixes #3434. Manifests are checked more carefully on anything that checks deps. Disabling plugins with invalid manifests from admin page.
Diffstat (limited to 'engine/classes/ElggPluginPackage.php')
| -rw-r--r-- | engine/classes/ElggPluginPackage.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/engine/classes/ElggPluginPackage.php b/engine/classes/ElggPluginPackage.php index 977b72d76..02b985285 100644 --- a/engine/classes/ElggPluginPackage.php +++ b/engine/classes/ElggPluginPackage.php @@ -334,7 +334,11 @@ class ElggPluginPackage { // first, check if any active plugin conflicts with us. foreach ($enabled_plugins as $plugin) { - $temp_conflicts = $plugin->getManifest()->getConflicts(); + $temp_conflicts = array(); + $temp_manifest = $plugin->getManifest(); + if ($temp_manifest instanceof ElggPluginManifest) { + $temp_conflicts = $plugin->getManifest()->getConflicts(); + } foreach ($temp_conflicts as $conflict) { if ($conflict['type'] == 'plugin' && $conflict['name'] == $this_id) { $result = $this->checkDepPlugin($conflict, $enabled_plugins, false); |