From 253c82d9b75d132ebd6975f3ab8321594f56afae Mon Sep 17 00:00:00 2001
From: markjaquith <markjaquith@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 19 May 2010 05:32:39 +0000
Subject: [PATCH] Misc HTML validation fixes. see #13383. props jshreve

git-svn-id: http://svn.automattic.com/wordpress/trunk@14737 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/ms-edit.php  |  8 ++++----
 wp-admin/ms-sites.php | 10 +++++-----
 wp-admin/ms-users.php |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/wp-admin/ms-edit.php b/wp-admin/ms-edit.php
index 42532cd8a8..c2ad779375 100644
--- a/wp-admin/ms-edit.php
+++ b/wp-admin/ms-edit.php
@@ -141,7 +141,7 @@ switch ( $_GET['action'] ) {
 		exit();
 	break;
 	case 'addblog':
-		check_admin_referer( 'add-blog' );
+		check_admin_referer( 'add-blog', '_wpnonce_add-blog' );
 
 		if ( ! current_user_can( 'manage_sites' ) )
 			wp_die( __( 'You do not have permission to access this page.' ) );
@@ -325,7 +325,7 @@ switch ( $_GET['action'] ) {
 
 	case 'allblogs':
 		if ( isset( $_POST['doaction']) || isset($_POST['doaction2'] ) ) {
-			check_admin_referer( 'bulk-ms-sites' );
+			check_admin_referer( 'bulk-ms-sites', '_wpnonce_bulk-ms-sites' );
 
 			if ( ! current_user_can( 'manage_sites' ) )
 				wp_die( __( 'You do not have permission to access this page.' ) );
@@ -507,7 +507,7 @@ switch ( $_GET['action'] ) {
 			wp_die( __( 'You do not have permission to access this page.' ) );
 
 		if ( isset( $_POST['doaction']) || isset($_POST['doaction2'] ) ) {
-			check_admin_referer( 'bulk-ms-users' );
+			check_admin_referer( 'bulk-ms-users', '_wpnonce_bulk-ms-users' );
 
 			if ( $_GET['action'] != -1 || $_POST['action2'] != -1 )
 				$doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2'];
@@ -590,7 +590,7 @@ switch ( $_GET['action'] ) {
 	break;
 
 	case 'adduser':
-		check_admin_referer( 'add-user' );
+		check_admin_referer( 'add-user', '_wpnonce_add-user' );
 		if ( ! current_user_can( 'manage_network_users' ) )
 			wp_die( __( 'You do not have permission to access this page.' ) );
 
diff --git a/wp-admin/ms-sites.php b/wp-admin/ms-sites.php
index c67e9d28c9..f233c3e944 100644
--- a/wp-admin/ms-sites.php
+++ b/wp-admin/ms-sites.php
@@ -246,10 +246,10 @@ switch ( $action ) {
 						if ( $val->user_id != $current_user->data->ID ) {
 							?>
 							<td>
-								<select name="role[<?php echo $val->user_id ?>]" id="new_role"><?php
+								<select name="role[<?php echo $val->user_id ?>]" id="new_role_1"><?php
 									foreach ( $editblog_roles as $role => $role_assoc ){
 										$name = translate_user_role( $role_assoc['name'] );
-										echo '<option ' . selected( $role, $existing_role ) . ' value="' . esc_attr( $role ) . '">' . esc_html( $name ) . '</option>';
+										echo '<option ' . selected( $role, $existing_role, false ) . ' value="' . esc_attr( $role ) . '">' . esc_html( $name ) . '</option>';
 									}
 									?>
 								</select>
@@ -282,7 +282,7 @@ switch ( $action ) {
 							<tr>
 								<th scope="row"><?php _e( 'Role:' ) ?></th>
 								<td>
-									<select name="new_role" id="new_role">
+									<select name="new_role" id="new_role_0">
 									<?php
 									reset( $editblog_roles );
 									foreach ( $editblog_roles as $role => $role_assoc ){
@@ -418,7 +418,7 @@ switch ( $action ) {
 				<option value="notspam"><?php _ex( 'Not Spam', 'site' ); ?></option>
 			</select>
 			<input type="submit" value="<?php esc_attr_e( 'Apply' ); ?>" name="doaction" id="doaction" class="button-secondary action" />
-			<?php wp_nonce_field( 'bulk-ms-sites' ); ?>
+			<?php wp_nonce_field( 'bulk-ms-sites', '_wpnonce_bulk-ms-sites' ); ?>
 		</div>
 
 		<?php if ( $page_links ) { ?>
@@ -679,7 +679,7 @@ switch ( $action ) {
 		<div id="form-add-site" class="wrap">
 			<h3><?php _e( 'Add Site' ) ?></h3>
 			<form method="post" action="ms-edit.php?action=addblog">
-				<?php wp_nonce_field( 'add-blog' ) ?>
+				<?php wp_nonce_field( 'add-blog', '_wpnonce_add-blog' ) ?>
 				<table class="form-table">
 					<tr class="form-field form-required">
 						<th scope="row"><?php _e( 'Site Address' ) ?></th>
diff --git a/wp-admin/ms-users.php b/wp-admin/ms-users.php
index f422466f76..60e4261d59 100644
--- a/wp-admin/ms-users.php
+++ b/wp-admin/ms-users.php
@@ -134,7 +134,7 @@ if ( isset( $_GET['updated'] ) && $_GET['updated'] == 'true' && ! empty( $_GET['
 					<option value="notspam"><?php _ex( 'Not Spam', 'user' ); ?></option>
 				</select>
 				<input type="submit" value="<?php esc_attr_e( 'Apply' ); ?>" name="doaction" id="doaction" class="button-secondary action" />
-				<?php wp_nonce_field( 'bulk-ms-users' ); ?>
+				<?php wp_nonce_field( 'bulk-ms-users', '_wpnonce_bulk-ms-users' ); ?>
 			</div>
 
 			<?php if ( $page_links ) { ?>
@@ -355,7 +355,7 @@ if ( apply_filters( 'show_adduser_fields', true ) ) :
 		</tr>
 	</table>
 	<p class="submit">
-		<?php wp_nonce_field( 'add-user' ) ?>
+		<?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ) ?>
 		<input class="button" type="submit" value="<?php esc_attr_e( 'Add user' ) ?>" /></p>
 	</form>
 </div>