WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Jeremy Felt 2015-07-13 17:24:24 +00:00
parent 5961dbb65b
commit 1d95cf1886
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wp-admin/network/sites.php
View File

@ -63,7 +63,6 @@ if ( isset( $_GET['action'] ) ) {
'deleteblog' => __( 'You are about to delete the site %s.' ), 'deleteblog' => __( 'You are about to delete the site %s.' ),
'unmatureblog' => __( 'You are about to mark the site %s as mature.' ), 'unmatureblog' => __( 'You are about to mark the site %s as mature.' ),
'matureblog' => __( 'You are about to mark the site %s as not mature.' ), 'matureblog' => __( 'You are about to mark the site %s as not mature.' ),
'allblogs' => '',
); );
if ( 'confirm' === $_GET['action'] ) { if ( 'confirm' === $_GET['action'] ) {
@ -109,19 +108,15 @@ if ( isset( $_GET['action'] ) ) {
<?php <?php
require_once( ABSPATH . 'wp-admin/admin-footer.php' ); require_once( ABSPATH . 'wp-admin/admin-footer.php' );
exit(); 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 = ''; $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'] ) { switch ( $_GET['action'] ) {
case 'deleteblog': case 'deleteblog':

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.