From 5ac0568ee324fcf2a1ef5279a605e916c18c1b08 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Thu, 29 Jan 2015 21:15:22 +0000 Subject: [PATCH] Switch to a 403 response code in places where it is more appropriate than a 500 due to permissions errors. props tomdxw. fixes #30927. Built from https://develop.svn.wordpress.org/trunk@31300 git-svn-id: http://core.svn.wordpress.org/trunk@31281 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/menu.php | 2 +- wp-admin/includes/ms.php | 4 ++-- wp-includes/version.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wp-admin/includes/menu.php b/wp-admin/includes/menu.php index 873f7379d9..cb6111a7d8 100644 --- a/wp-admin/includes/menu.php +++ b/wp-admin/includes/menu.php @@ -316,7 +316,7 @@ if ( !user_can_access_admin_page() ) { */ do_action( 'admin_page_access_denied' ); - wp_die( __('You do not have sufficient permissions to access this page.') ); + wp_die( __( 'You do not have sufficient permissions to access this page.' ), 403 ); } $menu = add_menu_classes($menu); diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php index 453b751aad..c58189e371 100644 --- a/wp-admin/includes/ms.php +++ b/wp-admin/includes/ms.php @@ -625,7 +625,7 @@ function _access_denied_splash() { $blog_name = get_bloginfo( 'name' ); if ( empty( $blogs ) ) - wp_die( sprintf( __( 'You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.' ), $blog_name ) ); + wp_die( sprintf( __( 'You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.' ), $blog_name ), 403 ); $output = '

' . sprintf( __( 'You attempted to access the "%1$s" dashboard, but you do not currently have privileges on this site. If you believe you should be able to access the "%1$s" dashboard, please contact your network administrator.' ), $blog_name ) . '

'; $output .= '

' . __( 'If you reached this screen by accident and meant to visit one of your own sites, here are some shortcuts to help you find your way.' ) . '

'; @@ -643,7 +643,7 @@ function _access_denied_splash() { $output .= ''; - wp_die( $output ); + wp_die( $output, 403 ); } add_action( 'admin_page_access_denied', '_access_denied_splash', 99 ); diff --git a/wp-includes/version.php b/wp-includes/version.php index d227db510f..59b268d3f4 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-alpha-31299'; +$wp_version = '4.2-alpha-31300'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.