From 1d95cf1886ce3b2056e21460131fa233a9c2f719 Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremy.felt@gmail.com>
Date: Mon, 13 Jul 2015 17:24:24 +0000
Subject: [PATCH] Handle MS Sites bulk action verification separately from
 individual actions.

After [33173], bulk actions would not process due to broken verification of the `bulk-sites` action. This reintroduces the proper action and treats bulk actions differently than individual site actions.

See #32963.

Built from https://develop.svn.wordpress.org/trunk@33194


git-svn-id: http://core.svn.wordpress.org/trunk@33166 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/network/sites.php | 15 +++++----------
 wp-includes/version.php    |  2 +-
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/wp-admin/network/sites.php b/wp-admin/network/sites.php
index fcbc2615ed..733383acad 100644
--- a/wp-admin/network/sites.php
+++ b/wp-admin/network/sites.php
@@ -63,7 +63,6 @@ if ( isset( $_GET['action'] ) ) {
 		'deleteblog'     => __( 'You are about to delete the site %s.' ),
 		'unmatureblog'   => __( 'You are about to mark the site %s as mature.' ),
 		'matureblog'     => __( 'You are about to mark the site %s as not mature.' ),
-		'allblogs'       => '',
 	);
 
 	if ( 'confirm' === $_GET['action'] ) {
@@ -109,19 +108,15 @@ if ( isset( $_GET['action'] ) ) {
 		<?php
 		require_once( ABSPATH . 'wp-admin/admin-footer.php' );
 		exit();
+	} elseif ( array_key_exists( $_GET['action'], $manage_actions ) ) {
+		$action = $_GET['action'];
+		check_admin_referer( $action . '_' . $id );
+	} elseif ( 'allblogs' === $_GET['action'] ) {
+		check_admin_referer( 'bulk-sites' );
 	}
 
 	$updated_action = '';
 
-	if ( array_key_exists( $_GET['action'], $manage_actions ) ) {
-		$action = $_GET['action'];
-		if ( 'allblogs' === $action ) {
-			$action = 'bulk-sites';
-		}
-
-		check_admin_referer( $action . '_' . $id );
-	}
-
 	switch ( $_GET['action'] ) {
 
 		case 'deleteblog':
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 07925c4cde..3c477929e5 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-beta2-33193';
+$wp_version = '4.3-beta2-33194';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.