golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Misc HTML validation fixes. see #13383. props jshreve 

git-svn-id: http://svn.automattic.com/wordpress/trunk@14737 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2010-05-19 05:32:39 +00:00
parent 20ac800bd9
commit 253c82d9b7
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-admin/ms-edit.php
View File

@ -141,7 +141,7 @@ switch ( $_GET['action'] ) {
exit(); exit();
break; break;
case 'addblog': case 'addblog':
check_admin_referer( 'add-blog' ); check_admin_referer( 'add-blog', '_wpnonce_add-blog' );
if ( ! current_user_can( 'manage_sites' ) ) if ( ! current_user_can( 'manage_sites' ) )
wp_die( __( 'You do not have permission to access this page.' ) ); wp_die( __( 'You do not have permission to access this page.' ) );
@ -325,7 +325,7 @@ switch ( $_GET['action'] ) {
case 'allblogs': case 'allblogs':
if ( isset( $_POST['doaction']) || isset($_POST['doaction2'] ) ) { 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' ) ) if ( ! current_user_can( 'manage_sites' ) )
wp_die( __( 'You do not have permission to access this page.' ) ); 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.' ) ); wp_die( __( 'You do not have permission to access this page.' ) );
if ( isset( $_POST['doaction']) || isset($_POST['doaction2'] ) ) { 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 ) if ( $_GET['action'] != -1 || $_POST['action2'] != -1 )
$doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2']; $doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2'];
@ -590,7 +590,7 @@ switch ( $_GET['action'] ) {
break; break;
case 'adduser': case 'adduser':
check_admin_referer( 'add-user' ); check_admin_referer( 'add-user', '_wpnonce_add-user' );
if ( ! current_user_can( 'manage_network_users' ) ) if ( ! current_user_can( 'manage_network_users' ) )
wp_die( __( 'You do not have permission to access this page.' ) ); wp_die( __( 'You do not have permission to access this page.' ) );

10
wp-admin/ms-sites.php
View File

@ -246,10 +246,10 @@ switch ( $action ) {
if ( $val->user_id != $current_user->data->ID ) { if ( $val->user_id != $current_user->data->ID ) {
?> ?>
<td> <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 ){ foreach ( $editblog_roles as $role => $role_assoc ){
$name = translate_user_role( $role_assoc['name'] ); $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> </select>
@ -282,7 +282,7 @@ switch ( $action ) {
<tr> <tr>
<th scope="row"><?php _e( 'Role:' ) ?></th> <th scope="row"><?php _e( 'Role:' ) ?></th>
<td> <td>
<select name="new_role" id="new_role"> <select name="new_role" id="new_role_0">
<?php <?php
reset( $editblog_roles ); reset( $editblog_roles );
foreach ( $editblog_roles as $role => $role_assoc ){ foreach ( $editblog_roles as $role => $role_assoc ){
@ -418,7 +418,7 @@ switch ( $action ) {
<option value="notspam"><?php _ex( 'Not Spam', 'site' ); ?></option> <option value="notspam"><?php _ex( 'Not Spam', 'site' ); ?></option>
</select> </select>
<input type="submit" value="<?php esc_attr_e( 'Apply' ); ?>" name="doaction" id="doaction" class="button-secondary action" /> <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> </div>
<?php if ( $page_links ) { ?> <?php if ( $page_links ) { ?>
@ -679,7 +679,7 @@ switch ( $action ) {
<div id="form-add-site" class="wrap"> <div id="form-add-site" class="wrap">
<h3><?php _e( 'Add Site' ) ?></h3> <h3><?php _e( 'Add Site' ) ?></h3>
<form method="post" action="ms-edit.php?action=addblog"> <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"> <table class="form-table">
<tr class="form-field form-required"> <tr class="form-field form-required">
<th scope="row"><?php _e( 'Site Address' ) ?></th> <th scope="row"><?php _e( 'Site Address' ) ?></th>

4
wp-admin/ms-users.php
View File

@ -134,7 +134,7 @@ if ( isset( $_GET['updated'] ) && $_GET['updated'] == 'true' && ! empty( $_GET['
<option value="notspam"><?php _ex( 'Not Spam', 'user' ); ?></option> <option value="notspam"><?php _ex( 'Not Spam', 'user' ); ?></option>
</select> </select>
<input type="submit" value="<?php esc_attr_e( 'Apply' ); ?>" name="doaction" id="doaction" class="button-secondary action" /> <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> </div>
<?php if ( $page_links ) { ?> <?php if ( $page_links ) { ?>
@ -355,7 +355,7 @@ if ( apply_filters( 'show_adduser_fields', true ) ) :
</tr> </tr>
</table> </table>
<p class="submit"> <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> <input class="button" type="submit" value="<?php esc_attr_e( 'Add user' ) ?>" /></p>
</form> </form>
</div> </div>