Renamed 'elgg' manifest requirment to 'elgg_version' to be more in line with the current options. Removed assignments in if statements. 1.7 manifest files properly show elgg_version as a requirement.

git-svn-id: http://code.elgg.org/elgg/trunk@7550 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 6 insertions, 4 deletions

diff --git a/engine/classes/ElggPluginPackage.php b/engine/classes/ElggPluginPackage.php
index c00df7f8d..8bb1f2a69 100644
--- a/engine/classes/ElggPluginPackage.php
+++ b/engine/classes/ElggPluginPackage.php
@@ -42,7 +42,7 @@ class ElggPluginPackage {
 	 * @var array
 	 */
 	private $_depsSupportedTypes = array(
-		'elgg', 'elgg_release', 'php_extension', 'php_ini', 'plugin'
+		'elgg_version', 'elgg_release', 'php_extension', 'php_ini', 'plugin'
 	);
 
 	/**
@@ -274,7 +274,9 @@ class ElggPluginPackage {
 	 */
 	private function _loadManifest() {
 		$file = $this->path . 'manifest.xml';
-		if ($this->manifest = new ElggPluginManifest($file, $this->id)) {
+		$this->manifest = new ElggPluginManifest($file, $this->id);
+
+		if ($this->manifest) {
 			return true;
 		}
 
@@ -312,7 +314,7 @@ class ElggPluginPackage {
 
 			foreach (${$dep_type} as $dep) {
 				switch ($dep['type']) {
-					case 'elgg':
+					case 'elgg_version':
 						$result = $this->_checkDepElgg($dep, get_version());
 						break;
 
@@ -484,7 +486,7 @@ class ElggPluginPackage {
 
 		foreach ($requires as $require) {
 			switch ($require['type']) {
-				case 'elgg':
+				case 'elgg_version':
 					$result = $this->_checkRequiresElgg($require, get_version());
 					break;