From b9c19736ff773e1ef18605ff4d10b92b555d61bd Mon Sep 17 00:00:00 2001
From: azaozz <azaozz@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sat, 4 Apr 2009 11:15:39 +0000
Subject: [PATCH] Remove unused code from wp-admin/plugins.php, props DD32,
 fixes #9454

git-svn-id: http://svn.automattic.com/wordpress/trunk@10867 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/plugins.php | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index 28482d075..9bcae3564 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -9,16 +9,14 @@
 /** WordPress Administration Bootstrap */
 require_once('admin.php');
 
-$action = '';
-foreach( array('activate-selected', 'deactivate-selected', 'delete-selected', 'clear-recent-list') as $action_key ) {
-	if( isset($_POST[$action_key]) ) {
-		$action = $action_key;
-		break;
-	}
-}
-
-if( isset($_REQUEST['action']) && !empty($_REQUEST['action']) )
-	$action = $_REQUEST['action'];
+if ( isset($_POST['clear-recent-list']) )
+	$action = 'clear-recent-list';
+elseif ( isset($_GET['action']) )
+	$action = $_GET['action'];
+elseif ( isset($_POST['action']) )
+	$action = $_POST['action'];
+else
+	$action = false;
 
 $plugin = isset($_REQUEST['plugin']) ? $_REQUEST['plugin'] : '';
 
@@ -127,7 +125,7 @@ if( !empty($action) ) {
 				<p><?php _e('Are you sure you wish to delete these files?') ?></p>
 				<form method="post" action="<?php echo clean_url($_SERVER['REQUEST_URI']); ?>" style="display:inline;">
 					<input type="hidden" name="verify-delete" value="1" />
-					<input type="hidden" name="delete-selected" value="1" />
+					<input type="hidden" name="action" value="delete-selected" />
 					<?php
 						foreach ( (array)$plugins as $plugin )
 							echo '<input type="hidden" name="checked[]" value="' . attribute_escape($plugin) . '" />';