From da535ce54e182012ee05693894c13f2f394a4efe Mon Sep 17 00:00:00 2001 From: duck_ Date: Fri, 2 Mar 2012 22:01:41 +0000 Subject: [PATCH] Drop unnecessary if-statements which also have some strange logic. Fixes #20159. git-svn-id: http://svn.automattic.com/wordpress/trunk@20092 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/network/sites.php | 4 +--- wp-admin/network/users.php | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/wp-admin/network/sites.php b/wp-admin/network/sites.php index b910eb9d8..d13a1a0af 100644 --- a/wp-admin/network/sites.php +++ b/wp-admin/network/sites.php @@ -78,9 +78,7 @@ if ( isset( $_GET['action'] ) ) { if ( ! current_user_can( 'manage_sites' ) ) wp_die( __( 'You do not have permission to access this page.' ) ); - if ( $_GET['action'] != -1 || $_POST['action2'] != -1 ) - $doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2']; - + $doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2']; $blogfunction = ''; foreach ( (array) $_POST['allblogs'] as $key => $val ) { diff --git a/wp-admin/network/users.php b/wp-admin/network/users.php index 25d853d9f..d26b71209 100644 --- a/wp-admin/network/users.php +++ b/wp-admin/network/users.php @@ -119,9 +119,7 @@ if ( isset( $_GET['action'] ) ) { if ( ( isset( $_POST['action']) || isset($_POST['action2'] ) ) && isset( $_POST['allusers'] ) ) { check_admin_referer( 'bulk-users-network' ); - if ( $_GET['action'] != -1 || $_POST['action2'] != -1 ) - $doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2']; - + $doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2']; $userfunction = ''; foreach ( (array) $_POST['allusers'] as $key => $val ) {