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

Update wp_die() calls modified in [31658] to use shorthand calling style. 

see #31422.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32127 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Nacin 2015-04-20 03:27:27 +00:00
parent 7f48138743
commit 9e92fab289
11 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/network/index.php
View File

@ -17,7 +17,7 @@ if ( !is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
if ( ! current_user_can( 'manage_network' ) )
wp_die( __( 'You do not have permission to access this page.' ), '', array( 'response' => 403 ) );
wp_die( __( 'You do not have permission to access this page.' ), 403 );
$title = __( 'Dashboard' );
$parent_file = 'index.php';

2
wp-admin/network/settings.php
View File

@ -17,7 +17,7 @@ if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
if ( ! current_user_can( 'manage_network_options' ) )
wp_die( __( 'You do not have permission to access this page.' ), '', array( 'response' => 403 ) );
wp_die( __( 'You do not have permission to access this page.' ), 403 );
$title = __( 'Network Settings' );
$parent_file = 'settings.php';

2
wp-admin/network/site-info.php
View File

@ -40,7 +40,7 @@ if ( ! $id )
$details = get_blog_details( $id );
if ( !can_edit_network( $details->site_id ) )
wp_die( __( 'You do not have permission to access this page.' ), '', array( 'response' => 403 ) );
wp_die( __( 'You do not have permission to access this page.' ), 403 );
$parsed = parse_url( $details->siteurl );
$is_main_site = is_main_site( $id );

2
wp-admin/network/site-settings.php
View File

@ -40,7 +40,7 @@ if ( ! $id )
$details = get_blog_details( $id );
if ( !can_edit_network( $details->site_id ) )
wp_die( __( 'You do not have permission to access this page.' ), '', array( 'response' => 403 ) );
wp_die( __( 'You do not have permission to access this page.' ), 403 );
$is_main_site = is_main_site( $id );

2
wp-admin/network/site-themes.php
View File

@ -57,7 +57,7 @@ $wp_list_table->prepare_items();
$details = get_blog_details( $id );
if ( !can_edit_network( $details->site_id ) )
wp_die( __( 'You do not have permission to access this page.' ), '', array( 'response' => 403 ) );
wp_die( __( 'You do not have permission to access this page.' ), 403 );
$is_main_site = is_main_site( $id );

2
wp-admin/network/site-users.php
View File

@ -50,7 +50,7 @@ if ( ! $id )
$details = get_blog_details( $id );
if ( ! can_edit_network( $details->site_id ) )
wp_die( __( 'You do not have permission to access this page.' ), '', array( 'response' => 403 ) );
wp_die( __( 'You do not have permission to access this page.' ), 403 );
$is_main_site = is_main_site( $id );

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

@ -14,7 +14,7 @@ if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
if ( ! current_user_can( 'manage_sites' ) )
wp_die( __( 'You do not have permission to access this page.' ), '', array( 'response' => 403 ) );
wp_die( __( 'You do not have permission to access this page.' ), 403 );
$wp_list_table = _get_list_table( 'WP_MS_Sites_List_Table' );
$pagenum = $wp_list_table->get_pagenum();

2
wp-admin/network/upgrade.php
View File

@ -36,7 +36,7 @@ get_current_screen()->set_help_sidebar(
require_once( ABSPATH . 'wp-admin/admin-header.php' );
if ( ! current_user_can( 'manage_network' ) )
wp_die( __( 'You do not have permission to access this page.' ), '', array( 'response' => 403 ) );
wp_die( __( 'You do not have permission to access this page.' ), 403 );
echo '<div class="wrap">';
echo '<h2>' . __( 'Upgrade Network' ) . '</h2>';

3
wp-admin/network/user-new.php
View File

@ -32,8 +32,9 @@ get_current_screen()->set_help_sidebar(
if ( isset($_REQUEST['action']) && 'add-user' == $_REQUEST['action'] ) {
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.' ), '', array( 'response' => 403 ) );
wp_die( __( 'You do not have permission to access this page.' ), 403 );
if ( ! is_array( $_POST['user'] ) )
wp_die( __( 'Cannot create an empty user.' ) );

10
wp-admin/network/users.php
View File

@ -14,7 +14,7 @@ if ( ! is_multisite() )
wp_die( __( 'Multisite support is not enabled.' ) );
if ( ! current_user_can( 'manage_network_users' ) )
wp_die( __( 'You do not have permission to access this page.' ), '', array( 'response' => 403 ) );
wp_die( __( 'You do not have permission to access this page.' ), 403 );
function confirm_delete_users( $users ) {
$current_user = wp_get_current_user();
@ -127,7 +127,7 @@ if ( isset( $_GET['action'] ) ) {
switch ( $_GET['action'] ) {
case 'deleteuser':
if ( ! current_user_can( 'manage_network_users' ) )
wp_die( __( 'You do not have permission to access this page.' ), '', array( 'response' => 403 ) );
wp_die( __( 'You do not have permission to access this page.' ), 403 );
check_admin_referer( 'deleteuser' );
@ -148,7 +148,7 @@ if ( isset( $_GET['action'] ) ) {
case 'allusers':
if ( !current_user_can( 'manage_network_users' ) )
wp_die( __( 'You do not have permission to access this page.' ), '', array( 'response' => 403 ) );
wp_die( __( 'You do not have permission to access this page.' ), 403 );
if ( ( isset( $_POST['action']) || isset($_POST['action2'] ) ) && isset( $_POST['allusers'] ) ) {
check_admin_referer( 'bulk-users-network' );
@ -161,7 +161,7 @@ if ( isset( $_GET['action'] ) ) {
switch ( $doaction ) {
case 'delete':
if ( ! current_user_can( 'delete_users' ) )
wp_die( __( 'You do not have permission to access this page.' ), '', array( 'response' => 403 ) );
wp_die( __( 'You do not have permission to access this page.' ), 403 );
$title = __( 'Users' );
$parent_file = 'users.php';
require_once( ABSPATH . 'wp-admin/admin-header.php' );
@ -210,7 +210,7 @@ if ( isset( $_GET['action'] ) ) {
case 'dodelete':
check_admin_referer( 'ms-users-delete' );
if ( ! ( current_user_can( 'manage_network_users' ) && current_user_can( 'delete_users' ) ) )
wp_die( __( 'You do not have permission to access this page.' ), '', array( 'response' => 403 ) );
wp_die( __( 'You do not have permission to access this page.' ), 403 );
if ( ! empty( $_POST['blog'] ) && is_array( $_POST['blog'] ) ) {
foreach ( $_POST['blog'] as $id => $users ) {

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.2-RC1-32143';
$wp_version = '4.2-RC1-32152';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.