From 0179e8c68b0827d77c61a31c8c0d6bf4a277c785 Mon Sep 17 00:00:00 2001
From: Brett Profitt <brett.profitt@gmail.com>
Date: Sat, 27 Aug 2011 10:41:35 -0700
Subject: Fixes #3434. Manifests are checked more carefully on anything that
 checks deps. Disabling plugins with invalid manifests from admin page.

---
 engine/lib/plugins.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'engine/lib/plugins.php')

diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php
index 88217b782..ba98e94f1 100644
--- a/engine/lib/plugins.php
+++ b/engine/lib/plugins.php
@@ -548,7 +548,12 @@ function elgg_get_plugins_provides($type = null, $name = null) {
 		$provides = array();
 
 		foreach ($active_plugins as $plugin) {
-			if ($plugin_provides = $plugin->getManifest()->getProvides()) {
+			$plugin_provides = array();
+			$manifest = $plugin->getManifest();
+			if ($manifest instanceof ElggPluginManifest) {
+				$plugin_provides = $plugin->getManifest()->getProvides();
+			}
+			if ($plugin_provides) {
 				foreach ($plugin_provides as $provided) {
 					$provides[$provided['type']][$provided['name']] = array(
 						'version' => $provided['version'],
-- 
cgit v1.2.3


From 4f6968700eb5eff3e45fdb4935c275e41a1d3adf Mon Sep 17 00:00:00 2001
From: Cash Costello <cash.costello@gmail.com>
Date: Sat, 10 Sep 2011 18:35:32 -0400
Subject: made the documentation of the plugin settings code a little clearer

---
 engine/lib/plugins.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'engine/lib/plugins.php')

diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php
index ba98e94f1..fd85ed9f0 100644
--- a/engine/lib/plugins.php
+++ b/engine/lib/plugins.php
@@ -816,7 +816,7 @@ function elgg_set_plugin_user_setting($name, $value, $user_guid = null, $plugin_
 /**
  * Unsets a user-specific plugin setting
  *
- * @param str $name      Name of the plugin setting
+ * @param str $name      Name of the setting
  * @param int $user_guid Defaults to logged in user
  * @param str $plugin_id Defaults to contextual plugin name
  *
@@ -839,7 +839,7 @@ function elgg_unset_plugin_user_setting($name, $user_guid = null, $plugin_id = n
 /**
  * Get a user specific setting for a plugin.
  *
- * @param string $name      The name.
+ * @param string $name      The name of the setting.
  * @param int    $user_guid Guid of owning user
  * @param string $plugin_id Optional plugin name, if not specified
  *                          it is detected from where you are calling.
@@ -863,7 +863,7 @@ function elgg_get_plugin_user_setting($name, $user_guid = null, $plugin_id = nul
 /**
  * Set a setting for a plugin.
  *
- * @param string $name      The name - note, can't be "title".
+ * @param string $name      The name of the setting - note, can't be "title".
  * @param mixed  $value     The value.
  * @param string $plugin_id Optional plugin name, if not specified
  *                          then it is detected from where you are calling from.
@@ -887,7 +887,7 @@ function elgg_set_plugin_setting($name, $value, $plugin_id = null) {
 /**
  * Get setting for a plugin.
  *
- * @param string $name      The name.
+ * @param string $name      The name of the setting.
  * @param string $plugin_id Optional plugin name, if not specified
  *                          then it is detected from where you are calling from.
  *
@@ -910,7 +910,7 @@ function elgg_get_plugin_setting($name, $plugin_id = null) {
 /**
  * Unsets a plugin setting.
  *
- * @param string $name      The name.
+ * @param string $name      The name of the setting.
  * @param string $plugin_id Optional plugin name, if not specified
  *                          then it is detected from where you are calling from.
  *
-- 
cgit v1.2.3