From f2123cdc42c8da21a297158fbb655f72bc92edce Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 5 Jan 2011 04:36:07 +0000
Subject: Fixes #2760. Refs #2759. Updated plugin admin actions to use the new
 system.  Added plugin dependency views in admin.
 ElggPluginPackage->checkDependencies() now returns the detected value.

git-svn-id: http://code.elgg.org/elgg/trunk@7838 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/classes/ElggPluginManifest.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'engine/classes/ElggPluginManifest.php')

diff --git a/engine/classes/ElggPluginManifest.php b/engine/classes/ElggPluginManifest.php
index 290a59a0c..9ddf60396 100644
--- a/engine/classes/ElggPluginManifest.php
+++ b/engine/classes/ElggPluginManifest.php
@@ -249,7 +249,13 @@ class ElggPluginManifest {
 	 * @return sting
 	 */
 	public function getLicense() {
-		return $this->parser->getAttribute('license');
+		// license vs licence.  Use license.
+		$en_us = $this->parser->getAttribute('license');
+		if ($en_us) {
+			return $en_us;
+		} else {
+			return $this->parser->getAttribute('licence');
+		}
 	}
 
 
-- 
cgit v1.2.3