Index: /trunk/src/wp-admin/custom-header.php =================================================================== --- /trunk/src/wp-admin/custom-header.php (revision 30355) +++ /trunk/src/wp-admin/custom-header.php (revision 30356) @@ -740,5 +740,5 @@ check_admin_referer('custom-header-upload', '_wpnonce-custom-header-upload'); if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); if ( empty( $_POST ) && isset( $_GET['file'] ) ) { @@ -891,8 +891,8 @@ if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); if ( ! empty( $_POST['skip-cropping'] ) && ! ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); if ( $_POST['oitar'] > 1 ) { Index: /trunk/src/wp-admin/customize.php =================================================================== --- /trunk/src/wp-admin/customize.php (revision 30355) +++ /trunk/src/wp-admin/customize.php (revision 30356) @@ -14,5 +14,5 @@ if ( ! current_user_can( 'customize' ) ) { - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); } Index: /trunk/src/wp-admin/edit-comments.php =================================================================== --- /trunk/src/wp-admin/edit-comments.php (revision 30355) +++ /trunk/src/wp-admin/edit-comments.php (revision 30356) @@ -10,5 +10,5 @@ require_once( dirname( __FILE__ ) . '/admin.php' ); if ( !current_user_can('edit_posts') ) - wp_die(__('Cheatin’ uh?')); + wp_die( __( 'Cheatin’ uh?' ), 403 ); $wp_list_table = _get_list_table('WP_Comments_List_Table'); Index: /trunk/src/wp-admin/edit-tags.php =================================================================== --- /trunk/src/wp-admin/edit-tags.php (revision 30355) +++ /trunk/src/wp-admin/edit-tags.php (revision 30356) @@ -19,5 +19,5 @@ if ( ! current_user_can( $tax->cap->manage_terms ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); $wp_list_table = _get_list_table('WP_Terms_List_Table'); @@ -48,5 +48,5 @@ if ( !current_user_can( $tax->cap->edit_terms ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); $ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST ); @@ -84,5 +84,5 @@ if ( !current_user_can( $tax->cap->delete_terms ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); wp_delete_term( $tag_ID, $taxonomy ); @@ -96,5 +96,5 @@ if ( !current_user_can( $tax->cap->delete_terms ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); $tags = (array) $_REQUEST['delete_tags']; @@ -134,5 +134,5 @@ if ( !current_user_can( $tax->cap->edit_terms ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); $tag = get_term( $tag_ID, $taxonomy ); Index: /trunk/src/wp-admin/edit.php =================================================================== --- /trunk/src/wp-admin/edit.php (revision 30355) +++ /trunk/src/wp-admin/edit.php (revision 30356) @@ -26,5 +26,5 @@ if ( ! current_user_can( $post_type_object->cap->edit_posts ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); $wp_list_table = _get_list_table('WP_Posts_List_Table'); Index: /trunk/src/wp-admin/includes/bookmark.php =================================================================== --- /trunk/src/wp-admin/includes/bookmark.php (revision 30355) +++ /trunk/src/wp-admin/includes/bookmark.php (revision 30356) @@ -28,5 +28,5 @@ function edit_link( $link_id = 0 ) { if ( !current_user_can( 'manage_links' ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); $_POST['link_url'] = esc_html( $_POST['link_url'] ); Index: /trunk/src/wp-admin/media-upload.php =================================================================== --- /trunk/src/wp-admin/media-upload.php (revision 30355) +++ /trunk/src/wp-admin/media-upload.php (revision 30356) @@ -33,8 +33,8 @@ // Require an ID for the edit screen. if ( isset($action) && $action == 'edit' && !$ID ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); if ( ! empty( $_REQUEST['post_id'] ) && ! current_user_can( 'edit_post' , $_REQUEST['post_id'] ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); // Upload type: image, video, file, ..? Index: /trunk/src/wp-admin/nav-menus.php =================================================================== --- /trunk/src/wp-admin/nav-menus.php (revision 30355) +++ /trunk/src/wp-admin/nav-menus.php (revision 30356) @@ -21,5 +21,5 @@ // Permissions Check if ( ! current_user_can('edit_theme_options') ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); wp_enqueue_script( 'nav-menu' ); Index: /trunk/src/wp-admin/network/site-users.php =================================================================== --- /trunk/src/wp-admin/network/site-users.php (revision 30355) +++ /trunk/src/wp-admin/network/site-users.php (revision 30356) @@ -134,5 +134,5 @@ // If the user doesn't already belong to the blog, bail. if ( !is_user_member_of_blog( $user_id ) ) - wp_die(__('Cheatin’ uh?')); + wp_die( __( 'Cheatin’ uh?' ), 403 ); $user = get_userdata( $user_id ); Index: /trunk/src/wp-admin/options.php =================================================================== --- /trunk/src/wp-admin/options.php (revision 30355) +++ /trunk/src/wp-admin/options.php (revision 30356) @@ -46,5 +46,5 @@ if ( !current_user_can( $capability ) ) - wp_die(__('Cheatin’ uh?')); + wp_die( __( 'Cheatin’ uh?' ), 403 ); // Handle admin email change requests @@ -70,5 +70,5 @@ if ( is_multisite() && !is_super_admin() && 'update' != $action ) - wp_die(__('Cheatin’ uh?')); + wp_die( __( 'Cheatin’ uh?' ), 403 ); $whitelist_options = array( Index: /trunk/src/wp-admin/post-new.php =================================================================== --- /trunk/src/wp-admin/post-new.php (revision 30355) +++ /trunk/src/wp-admin/post-new.php (revision 30356) @@ -49,5 +49,5 @@ if ( ! current_user_can( $post_type_object->cap->edit_posts ) || ! current_user_can( $post_type_object->cap->create_posts ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); // Schedule auto-draft cleanup Index: /trunk/src/wp-admin/press-this.php =================================================================== --- /trunk/src/wp-admin/press-this.php (revision 30355) +++ /trunk/src/wp-admin/press-this.php (revision 30356) @@ -15,5 +15,5 @@ if ( ! current_user_can( 'edit_posts' ) || ! current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); /** Index: /trunk/src/wp-admin/themes.php =================================================================== --- /trunk/src/wp-admin/themes.php (revision 30355) +++ /trunk/src/wp-admin/themes.php (revision 30356) @@ -11,5 +11,5 @@ if ( !current_user_can('switch_themes') && !current_user_can('edit_theme_options') ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); if ( current_user_can( 'switch_themes' ) && isset($_GET['action'] ) ) { @@ -18,5 +18,5 @@ $theme = wp_get_theme( $_GET['stylesheet'] ); if ( ! $theme->exists() || ! $theme->is_allowed() ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); switch_theme( $theme->get_stylesheet() ); wp_redirect( admin_url('themes.php?activated=true') ); @@ -26,5 +26,5 @@ $theme = wp_get_theme( $_GET['stylesheet'] ); if ( !current_user_can('delete_themes') || ! $theme->exists() ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); delete_theme($_GET['stylesheet']); wp_redirect( admin_url('themes.php?deleted=true') ); Index: /trunk/src/wp-admin/user-new.php =================================================================== --- /trunk/src/wp-admin/user-new.php (revision 30355) +++ /trunk/src/wp-admin/user-new.php (revision 30356) @@ -12,7 +12,7 @@ if ( is_multisite() ) { if ( ! current_user_can( 'create_users' ) && ! current_user_can( 'promote_users' ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); } elseif ( ! current_user_can( 'create_users' ) ) { - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); } @@ -56,5 +56,5 @@ if ( ! current_user_can('promote_user', $user_details->ID) ) - wp_die(__('Cheatin’ uh?')); + wp_die( __( 'Cheatin’ uh?' ), 403 ); // Adding an existing user to this blog @@ -93,5 +93,5 @@ if ( ! current_user_can('create_users') ) - wp_die(__('Cheatin’ uh?')); + wp_die( __( 'Cheatin’ uh?' ), 403 ); if ( ! is_multisite() ) { Index: /trunk/src/wp-admin/users.php =================================================================== --- /trunk/src/wp-admin/users.php (revision 30355) +++ /trunk/src/wp-admin/users.php (revision 30356) @@ -11,5 +11,5 @@ if ( ! current_user_can( 'list_users' ) ) - wp_die( __( 'Cheatin’ uh?' ) ); + wp_die( __( 'Cheatin’ uh?' ), 403 ); $wp_list_table = _get_list_table('WP_Users_List_Table'); @@ -129,5 +129,5 @@ // If the user doesn't already belong to the blog, bail. if ( is_multisite() && !is_user_member_of_blog( $id ) ) - wp_die(__('Cheatin’ uh?')); + wp_die( __( 'Cheatin’ uh?' ), 403 ); $user = get_userdata( $id ); Index: /trunk/src/wp-admin/widgets.php =================================================================== --- /trunk/src/wp-admin/widgets.php (revision 30355) +++ /trunk/src/wp-admin/widgets.php (revision 30356) @@ -14,5 +14,5 @@ if ( ! current_user_can('edit_theme_options') ) - wp_die( __( 'Cheatin’ uh?' )); + wp_die( __( 'Cheatin’ uh?' ), 403 ); $widgets_access = get_user_setting( 'widgets_access' ); Index: /trunk/src/wp-includes/functions.php =================================================================== --- /trunk/src/wp-includes/functions.php (revision 30355) +++ /trunk/src/wp-includes/functions.php (revision 30356) @@ -2313,5 +2313,4 @@ */ function wp_nonce_ays( $action ) { - $title = __( 'WordPress Failure Notice' ); if ( 'log-out' == $action ) { $html = sprintf( __( 'You are attempting to log out of %s' ), get_bloginfo( 'name' ) ) . '
'; @@ -2324,5 +2323,5 @@ } - wp_die( $html, $title, array('response' => 403) ); + wp_die( $html, __( 'WordPress Failure Notice' ), 403 ); }