From 96604b6836edc0ee2f9bfc58fdbaedf19a6f099c Mon Sep 17 00:00:00 2001
From: Brett Profitt <brett.profitt@gmail.com>
Date: Thu, 13 Oct 2011 22:08:26 -0700
Subject: Fixes #3917. Removed uses of admin interface in manifests. Removed
 related code.

---
 engine/classes/ElggPluginManifest.php          | 18 ------------------
 engine/classes/ElggPluginManifestParser18.php  |  3 +--
 engine/lib/admin.php                           |  2 --
 engine/tests/api/plugins.php                   |  5 -----
 engine/tests/test_files/plugin_18/manifest.xml |  1 -
 5 files changed, 1 insertion(+), 28 deletions(-)

(limited to 'engine')

diff --git a/engine/classes/ElggPluginManifest.php b/engine/classes/ElggPluginManifest.php
index 0e47f388d..eacc16455 100644
--- a/engine/classes/ElggPluginManifest.php
+++ b/engine/classes/ElggPluginManifest.php
@@ -552,24 +552,6 @@ class ElggPluginManifest {
 		return $normalized;
 	}
 
-	/**
-	 * Returns the admin interface to use.
-	 *
-	 *  @return string simple or advanced
-	 */
-	public function getAdminInterface() {
-		$interface = $this->parser->getAttribute('admin_interface');
-
-		switch ($interface) {
-			case 'simple':
-			case 'advanced':
-				return $interface;
-
-			default:
-				return 'advanced';
-		}
-	}
-
 	/**
 	 * Returns the admin interface to use.
 	 *
diff --git a/engine/classes/ElggPluginManifestParser18.php b/engine/classes/ElggPluginManifestParser18.php
index db8b3dc6a..554e28c02 100644
--- a/engine/classes/ElggPluginManifestParser18.php
+++ b/engine/classes/ElggPluginManifestParser18.php
@@ -16,7 +16,7 @@ class ElggPluginManifestParser18 extends ElggPluginManifestParser {
 		'name', 'author', 'version', 'blurb', 'description',
 		'website', 'copyright', 'license', 'requires', 'suggests',
 		'screenshot', 'category', 'conflicts', 'provides',
-		'admin_interface', 'activate_on_install'
+		'activate_on_install'
 	);
 
 	/**
@@ -46,7 +46,6 @@ class ElggPluginManifestParser18 extends ElggPluginManifestParser {
 				case 'website':
 				case 'copyright':
 				case 'license':
-				case 'admin_interface':
 				case 'activate_on_install':
 					$parsed[$element->name] = $element->content;
 					break;
diff --git a/engine/lib/admin.php b/engine/lib/admin.php
index d12baed50..ae6429baf 100644
--- a/engine/lib/admin.php
+++ b/engine/lib/admin.php
@@ -230,8 +230,6 @@ function admin_init() {
 
 	elgg_register_action('admin/delete_admin_notice', '', 'admin');
 
-	elgg_register_action('admin/plugins/simple_update_states', '', 'admin');
-
 	elgg_register_action('profile/fields/reset', '', 'admin');
 	elgg_register_action('profile/fields/add', '', 'admin');
 	elgg_register_action('profile/fields/edit', '', 'admin');
diff --git a/engine/tests/api/plugins.php b/engine/tests/api/plugins.php
index 72092b688..8f5f5dd1e 100644
--- a/engine/tests/api/plugins.php
+++ b/engine/tests/api/plugins.php
@@ -105,7 +105,6 @@ class ElggCorePluginsAPITest extends ElggCoreUnitTest {
 				array('type' => 'plugin', 'name' => 'facebook_connect', 'version' => 1.0),
 			),
 
-			'admin_interface' => 'simple',
 			'activate_on_install' => true
 		);
 
@@ -265,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);
 	}
diff --git a/engine/tests/test_files/plugin_18/manifest.xml b/engine/tests/test_files/plugin_18/manifest.xml
index 23f0fa0bf..445a41c2e 100644
--- a/engine/tests/test_files/plugin_18/manifest.xml
+++ b/engine/tests/test_files/plugin_18/manifest.xml
@@ -34,7 +34,6 @@
 
 	<category>ServiceAPI</category>
 
-	<admin_interface>simple</admin_interface>
 	<activate_on_install>true</activate_on_install>
 
 	<requires>
-- 
cgit v1.2.3