Changeset 30167

Timestamp:

11/01/2014 10:47:27 PM (10 years ago)

Author:

wonderboymusic

Message:

In wp_ajax_ajax_tag_search(), bail immediately if $_GET['tax'] isn't set so that all of the variable setting can happen in the same nest scope as the rest of the function - wp_die() confuses Scrutinizer.

See #30224.

File:

• trunk/src/wp-admin/includes/ajax-actions.php (modified) (2 diffs)

trunk/src/wp-admin/includes/ajax-actions.php

@@ -104 +104 @@
  */
 function wp_ajax_ajax_tag_search() {
-    if ( isset( $_GET['tax'] ) ) {
-        $taxonomy = sanitize_key( $_GET['tax'] );
-        $tax = get_taxonomy( $taxonomy );
-        if ( ! $tax )
-            wp_die( 0 );
-        if ( ! current_user_can( $tax->cap->assign_terms ) )
-            wp_die( -1 );
-    } else {
+    if ( ! isset( $_GET['tax'] ) ) {
         wp_die( 0 );
+    }
+
+    $taxonomy = sanitize_key( $_GET['tax'] );
+    $tax = get_taxonomy( $taxonomy );
+    if ( ! $tax ) {
+        wp_die( 0 );
+    }
+
+    if ( ! current_user_can( $tax->cap->assign_terms ) ) {
+        wp_die( -1 );
     }
 
@@ -1143 +1146 @@
         if ( isset($_POST['metakeyselect']) && '#NONE#' == $_POST['metakeyselect'] && empty($_POST['metakeyinput']) )
             wp_die( 1 );
-        
+
         // If the post is an autodraft, save the post as a draft and then
         // attempt to save the meta.