WP Merge to revision 8266

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1355 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 4 insertions, 6 deletions

diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php
index 72acd45..2822dac 100644
--- a/wp-admin/includes/plugin.php
+++ b/wp-admin/includes/plugin.php
@@ -470,18 +470,16 @@ function get_plugin_page_hookname( $plugin_page, $parent_page ) {
 
 	$parent = get_admin_page_parent();
 
+	$page_type = 'admin';
 	if ( empty ( $parent_page ) || 'admin.php' == $parent_page ) {
 		if ( isset( $admin_page_hooks[$plugin_page] ))
 			$page_type = 'toplevel';
 		else
 			if ( isset( $admin_page_hooks[$parent] ))
 				$page_type = $admin_page_hooks[$parent];
-	} else
-		if ( isset( $admin_page_hooks[$parent_page] ) ) {
-			$page_type = $admin_page_hooks[$parent_page];
-		} else {
-			$page_type = 'admin';
-		}
+	} else if ( isset( $admin_page_hooks[$parent_page] ) ) {
+		$page_type = $admin_page_hooks[$parent_page];
+	}
 
 	$plugin_name = preg_replace( '!\.php!', '', $plugin_page );