Changeset 32152

Timestamp:

04/20/2015 03:26:24 AM (10 years ago)

Author:

nacin

Message:

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

see #31422.

Location:

trunk/src/wp-admin/network

Files:

• index.php (modified) (1 diff)
• settings.php (modified) (1 diff)
• site-info.php (modified) (1 diff)
• site-settings.php (modified) (1 diff)
• site-themes.php (modified) (1 diff)
• site-users.php (modified) (1 diff)
• sites.php (modified) (1 diff)
• upgrade.php (modified) (1 diff)
• user-new.php (modified) (1 diff)
• users.php (modified) (5 diffs)

trunk/src/wp-admin/network/index.php

@@ -18 +18 @@
 
 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' );

trunk/src/wp-admin/network/settings.php

@@ -18 +18 @@
 
 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' );

trunk/src/wp-admin/network/site-info.php

@@ -41 +41 @@
 $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 );

trunk/src/wp-admin/network/site-settings.php

@@ -41 +41 @@
 $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 );

trunk/src/wp-admin/network/site-themes.php

@@ -58 +58 @@
 $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 );

trunk/src/wp-admin/network/site-users.php

@@ -51 +51 @@
 $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 );

trunk/src/wp-admin/network/sites.php

@@ -15 +15 @@
 
 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' );

trunk/src/wp-admin/network/upgrade.php

@@ -37 +37 @@
 
 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">';

trunk/src/wp-admin/network/user-new.php

@@ -33 +33 @@
 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'] ) )

trunk/src/wp-admin/network/users.php

@@ -15 +15 @@
 
 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 ) {
@@ -128 +128 @@
         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' );
@@ -149 +149 @@
         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'] ) ) {
@@ -162 +162 @@
                             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';
@@ -211 +211 @@
             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'] ) ) {