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

Provide more helpful feedback than just "Cheatin' uh?" for permission errors in `wp-includes/class-wp-customize-manager.php`. 

props kraftbj.
fixes #33684. see #14530.
Built from https://develop.svn.wordpress.org/trunk@33889


git-svn-id: http://core.svn.wordpress.org/trunk@33858 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2015-09-03 09:21:23 +00:00
parent bc8af88903
commit ba056692a6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-includes/class-wp-customize-manager.php
View File

@ -218,13 +218,13 @@ final class WP_Customize_Manager {
if ( is_admin() && ! $doing_ajax_or_is_customized ) { if ( is_admin() && ! $doing_ajax_or_is_customized ) {
auth_redirect(); auth_redirect();
} elseif ( $doing_ajax_or_is_customized && ! is_user_logged_in() ) { } elseif ( $doing_ajax_or_is_customized && ! is_user_logged_in() ) {
$this->wp_die( 0 ); $this->wp_die( 0, 'You must be logged in to complete this action.' );
} }
show_admin_bar( false ); show_admin_bar( false );
if ( ! current_user_can( 'customize' ) ) { if ( ! current_user_can( 'customize' ) ) {
$this->wp_die( -1 ); $this->wp_die( -1, 'You are not allowed to customize the appearance of this site.' );
} }
$this->original_stylesheet = get_stylesheet(); $this->original_stylesheet = get_stylesheet();
@ -238,17 +238,17 @@ final class WP_Customize_Manager {
// If the requested theme is not the active theme and the user doesn't have the // If the requested theme is not the active theme and the user doesn't have the
// switch_themes cap, bail. // switch_themes cap, bail.
if ( ! current_user_can( 'switch_themes' ) ) { if ( ! current_user_can( 'switch_themes' ) ) {
$this->wp_die( -1 ); $this->wp_die( -1, 'You are not allowed to edit theme options on this site.' );
} }
// If the theme has errors while loading, bail. // If the theme has errors while loading, bail.
if ( $this->theme()->errors() ) { if ( $this->theme()->errors() ) {
$this->wp_die( -1 ); $this->wp_die( -1, $this->theme()->errors()->get_error_message() );
} }
// If the theme isn't allowed per multisite settings, bail. // If the theme isn't allowed per multisite settings, bail.
if ( ! $this->theme()->is_allowed() ) { if ( ! $this->theme()->is_allowed() ) {
$this->wp_die( -1 ); $this->wp_die( -1, 'The requested theme does not exist.' );
} }
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-33888'; $wp_version = '4.4-alpha-33889';
/** /**
* 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.