Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

1 files changed, 8 insertions, 25 deletions

diff --git a/engine/tests/api/plugins.php b/engine/tests/api/plugins.php
index 00b0d4513..a0faaff0e 100644
--- a/engine/tests/api/plugins.php
+++ b/engine/tests/api/plugins.php
@@ -68,8 +68,8 @@ class ElggCorePluginsAPITest extends ElggCoreUnitTest {
 			'blurb' => 'A concise description.',
 			'description' => 'A longer, more interesting description.',
 			'website' => 'http://www.elgg.org/',
-			'copyright' => '(C) Elgg 2010',
-			'license' => 'GNU Public License version 2',
+			'copyright' => '(C) Elgg Foundation 2011',
+			'license' => 'GNU General Public License version 2',
 
 			'requires' => array(
 				array('type' => 'elgg_version', 'version' => '3009030802', 'comparison' => 'lt'),
@@ -105,7 +105,6 @@ class ElggCorePluginsAPITest extends ElggCoreUnitTest {
 				array('type' => 'plugin', 'name' => 'facebook_connect', 'version' => 1.0),
 			),
 
-			'admin_interface' => 'simple',
 			'activate_on_install' => true
 		);
 
@@ -118,8 +117,8 @@ class ElggCorePluginsAPITest extends ElggCoreUnitTest {
 			'version' => '1.0',
 			'description' => 'A 1.7-style manifest.',
 			'website' => 'http://www.elgg.org/',
-			'copyright' => '(C) Elgg 2010',
-			'license' => 'GNU Public License version 2',
+			'copyright' => '(C) Elgg Foundation 2011',
+			'license' => 'GNU General Public License version 2',
 			'elgg_version' => '2009030702',
 			'name' => 'Plugin Test 17',
 		);
@@ -166,13 +165,13 @@ class ElggCorePluginsAPITest extends ElggCoreUnitTest {
 	}
 
 	public function testElggPluginManifestGetCopyright() {
-		$this->assertEqual($this->manifest18->getCopyright(), '(C) Elgg 2010');
-		$this->assertEqual($this->manifest18->getCopyright(), '(C) Elgg 2010');
+		$this->assertEqual($this->manifest18->getCopyright(), '(C) Elgg Foundation 2011');
+		$this->assertEqual($this->manifest18->getCopyright(), '(C) Elgg Foundation 2011');
 	}
 
 	public function testElggPluginManifestGetLicense() {
-		$this->assertEqual($this->manifest18->getLicense(), 'GNU Public License version 2');
-		$this->assertEqual($this->manifest17->getLicense(), 'GNU Public License version 2');
+		$this->assertEqual($this->manifest18->getLicense(), 'GNU General Public License version 2');
+		$this->assertEqual($this->manifest17->getLicense(), 'GNU General Public License version 2');
 	}
 
 
@@ -215,18 +214,6 @@ class ElggCorePluginsAPITest extends ElggCoreUnitTest {
 		$this->assertEqual($this->package17->getManifest()->getDescription(), 'A 1.7-style manifest.');
 	}
 
-	public function testElggPluginManifestGetDescriptionTranslated() {
-		$en = array(
-			$this->package18->getManifest()->getDescription() => 'A translated 1.8 description!',
-			$this->package17->getManifest()->getDescription() => 'A translated 1.7 description!',
-		);
-
-		add_translation('en', $en);
-
-		$this->assertEqual($this->package18->getManifest()->getDescription(), 'A translated 1.8 description!');
-		$this->assertEqual($this->package17->getManifest()->getDescription(), 'A translated 1.7 description!');
-	}
-
 	public function testElggPluginManifestGetCategories() {
 		$categories = array(
 			'Admin', 'ServiceAPI'
@@ -277,10 +264,6 @@ class ElggCorePluginsAPITest extends ElggCoreUnitTest {
 		$this->assertEqual($this->manifest17->getConflicts(), array());
 	}
 
-	public function testElggPluginManifestGetAdminInterface() {
-		$this->assertEqual($this->manifest18->getAdminInterface(), 'simple');
-	}
-
 	public function testElggPluginManifestGetActivateOnInstall() {
 		$this->assertEqual($this->manifest18->getActivateOnInstall(), true);
 	}