Changeset 33163 for trunk/src/wp-includes/class-wp-customize-nav-menus.php

Timestamp:

07/11/2015 07:59:25 PM (10 years ago)

Author:

ocean90

Message:

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

see #32576.

File:

• trunk/src/wp-includes/class-wp-customize-nav-menus.php (modified) (4 diffs)

trunk/src/wp-includes/class-wp-customize-nav-menus.php

@@ -71 +71 @@
 
         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'] ) ) {
-            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'] );
         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'] );
         $page = isset( $_POST['page'] ) ? absint( $_POST['page'] ) : 0;
@@ -87 +89 @@
         if ( 'post_type' === $obj_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' );
             }
 
@@ -139 +141 @@
             ) );
             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() );
             }
 
@@ -166 +168 @@
         check_ajax_referer( 'customize-menus', 'customize-menus-nonce' );
 
-        if ( ! current_user_can( 'edit_theme_options' ) ) {
-            wp_send_json_error( array( 'message' => __( 'Error: invalid user capabilities.' ) ) );
-        }
+        if ( current_user_can( 'edit_theme_options' ) ) {
+            wp_die( -1 );
+        }
+
         if ( empty( $_POST['search'] ) ) {
-            wp_send_json_error( array( 'message' => __( 'Error: missing search parameter.' ) ) );
+            wp_send_json_error( 'nav_menus_missing_search_parameter' );
         }