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

Customizer: Replace non-visible error messages for nav menus with error codes. 

see #32576.
Built from https://develop.svn.wordpress.org/trunk@33163


git-svn-id: http://core.svn.wordpress.org/trunk@33135 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2015-07-11 20:00:24 +00:00
parent 8b31074880
commit cb2782aaa0
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wp-includes/class-wp-customize-nav-menus.php
View File

@ -70,23 +70,25 @@ final class WP_Customize_Nav_Menus {
check_ajax_referer( 'customize-menus', 'customize-menus-nonce' ); check_ajax_referer( 'customize-menus', 'customize-menus-nonce' );
if ( ! current_user_can( 'edit_theme_options' ) ) { if ( ! current_user_can( 'edit_theme_options' ) ) {
wp_send_json_error( array( 'message' => __( 'Error: invalid user capabilities.' ) ) ); wp_die( -1 );
} }
if ( empty( $_POST['obj_type'] ) || empty( $_POST['type'] ) ) { if ( empty( $_POST['obj_type'] ) || empty( $_POST['type'] ) ) {
wp_send_json_error( array( 'message' => __( 'Missing obj_type or type param.' ) ) ); wp_send_json_error( 'nav_menus_missing_obj_type_or_type_parameter' );
} }
$obj_type = sanitize_key( $_POST['obj_type'] ); $obj_type = sanitize_key( $_POST['obj_type'] );
if ( ! in_array( $obj_type, array( 'post_type', 'taxonomy' ) ) ) { if ( ! in_array( $obj_type, array( 'post_type', 'taxonomy' ) ) ) {
wp_send_json_error( array( 'message' => __( 'Invalid obj_type param: ' . $obj_type ) ) ); wp_send_json_error( 'nav_menus_invalid_obj_type' );
} }
$taxonomy_or_post_type = sanitize_key( $_POST['type'] ); $taxonomy_or_post_type = sanitize_key( $_POST['type'] );
$page = isset( $_POST['page'] ) ? absint( $_POST['page'] ) : 0; $page = isset( $_POST['page'] ) ? absint( $_POST['page'] ) : 0;
$items = array(); $items = array();
if ( 'post_type' === $obj_type ) { if ( 'post_type' === $obj_type ) {
if ( ! get_post_type_object( $taxonomy_or_post_type ) ) { if ( ! get_post_type_object( $taxonomy_or_post_type ) ) {
wp_send_json_error( array( 'message' => __( 'Unknown post type.' ) ) ); wp_send_json_error( 'nav_menus_invalid_post_type' );
} }
if ( 0 === $page && 'page' === $taxonomy_or_post_type ) { if ( 0 === $page && 'page' === $taxonomy_or_post_type ) {
@ -138,7 +140,7 @@ final class WP_Customize_Nav_Menus {
'pad_counts' => false, 'pad_counts' => false,
) ); ) );
if ( is_wp_error( $terms ) ) { if ( is_wp_error( $terms ) ) {
wp_send_json_error( array( 'message' => wp_strip_all_tags( $terms->get_error_message(), true ) ) ); wp_send_json_error( $terms->get_error_code() );
} }
foreach ( $terms as $term ) { foreach ( $terms as $term ) {
@ -165,11 +167,12 @@ final class WP_Customize_Nav_Menus {
public function ajax_search_available_items() { public function ajax_search_available_items() {
check_ajax_referer( 'customize-menus', 'customize-menus-nonce' ); check_ajax_referer( 'customize-menus', 'customize-menus-nonce' );
if ( ! current_user_can( 'edit_theme_options' ) ) { if ( current_user_can( 'edit_theme_options' ) ) {
wp_send_json_error( array( 'message' => __( 'Error: invalid user capabilities.' ) ) ); wp_die( -1 );
} }
if ( empty( $_POST['search'] ) ) { if ( empty( $_POST['search'] ) ) {
wp_send_json_error( array( 'message' => __( 'Error: missing search parameter.' ) ) ); wp_send_json_error( 'nav_menus_missing_search_parameter' );
} }
$p = isset( $_POST['page'] ) ? absint( $_POST['page'] ) : 0; $p = isset( $_POST['page'] ) ? absint( $_POST['page'] ) : 0;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.3-beta2-33162'; $wp_version = '4.3-beta2-33163';
/** /**
* 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.