From 029fa3a7d53b390e962bbed7b04064b0d322cfd2 Mon Sep 17 00:00:00 2001
From: Mark Jaquith <markjaquith@git.wordpress.org>
Date: Wed, 19 May 2010 05:15:06 +0000
Subject: [PATCH] Revert accidental inclusion of another patch in [14734]. Doh.
Reviewing that one next!
git-svn-id: https://develop.svn.wordpress.org/trunk@14735 602fd350-edb4-49c9-b593-d223f7449a82
---
wp-admin/ms-edit.php | 8 ++++----
wp-admin/ms-sites.php | 4 ++--
wp-admin/ms-users.php | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/wp-admin/ms-edit.php b/wp-admin/ms-edit.php
index c2ad779375..42532cd8a8 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', '_wpnonce_add-blog' );
+ check_admin_referer( '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', '_wpnonce_bulk-ms-sites' );
+ check_admin_referer( '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', '_wpnonce_bulk-ms-users' );
+ check_admin_referer( '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', '_wpnonce_add-user' );
+ check_admin_referer( '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 ed7268879e..c67e9d28c9 100644
--- a/wp-admin/ms-sites.php
+++ b/wp-admin/ms-sites.php
@@ -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', '_wpnonce_bulk-ms-sites' ); ?>
+ <?php wp_nonce_field( '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', '_wpnonce_add-blog' ) ?>
+ <?php wp_nonce_field( '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 60e4261d59..f422466f76 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', '_wpnonce_bulk-ms-users' ); ?>
+ <?php wp_nonce_field( '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', '_wpnonce_add-user' ) ?>
+ <?php wp_nonce_field( 'add-user' ) ?>
<input class="button" type="submit" value="<?php esc_attr_e( 'Add user' ) ?>" /></p>
</form>
</div>