Changeset 44537

Timestamp:

01/10/2019 02:36:40 AM (8 years ago)

Author:

desrosj

Message:

REST API: Restore use of wp_ajax_ajax_tag_search() for tag search.

This solution does not work with custom taxonomies in the current state.

Reverts [42614,42619,42737].

Props danielbachhuber.
See #38922.

Location:

trunk

Files:

• src/js/_enqueues/admin/tags-suggest.js (modified) (4 diffs)
• src/wp-admin/includes/ajax-actions.php (modified) (1 diff)
• src/wp-admin/includes/deprecated.php (modified) (1 diff)
• tests/phpunit/tests/ajax/TagSearch.php (copied) (copied from trunk/tests/phpunit/tests/ajax/TagSearch.php )

trunk/src/js/_enqueues/admin/tags-suggest.js

@@ -1 +1 @@
 /**
  * Default settings for jQuery UI Autocomplete for use with non-hierarchical taxonomies.
- *
- * @output wp-admin/js/tags-suggest.js
  */
 ( function( $ ) {
@@ -9 +7 @@
         }
 
+        var tempID = 0;
         var separator = window.tagsSuggestL10n.tagDelimiter || ',';
 
@@ -55 +54 @@
                                 term = getLast( request.term );
 
-                                $.get( window.tagsSuggestL10n.restURL, {
-                                        _fields: [ 'id', 'name' ],
-                                        taxonomy: taxonomy,
-                                        search: term
+                                $.get( window.ajaxurl, {
+                                        action: 'ajax-tag-search',
+                                        tax: taxonomy,
+                                        q: term
                                 } ).always( function() {
                                         $element.removeClass( 'ui-autocomplete-loading' ); // UI fails to remove this sometimes?
                                 } ).done( function( data ) {
-                                        cache = data;
-                                        response( data );
+                                        var tagName;
+                                        var tags = [];
+
+                                        if ( data ) {
+                                                data = data.split( '\n' );
+
+                                                for ( tagName in data ) {
+                                                        var id = ++tempID;
+
+                                                        tags.push({
+                                                                id: id,
+                                                                name: data[tagName]
+                                                        });
+                                                }
+
+                                                cache = tags;
+                                                response( tags );
+                                        } else {
+                                                response( tags );
+                                        }
                                 } );
 
@@ -102 +119 @@
                                 $element.attr( 'aria-expanded', 'false' );
                         },
-                        minLength: window.tagsSuggestL10n.minChars,
+                        minLength: 2,
                         position: {
                                 my: 'left top+2',

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

@@ -98 +98 @@
 
         wp_die( 0 );
+}
+
+/**
+ * Ajax handler for tag search.
+ *
+ * @since 3.1.0
+ */
+function wp_ajax_ajax_tag_search() {
+        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 );
+        }
+
+        $s = wp_unslash( $_GET['q'] );
+
+        $comma = _x( ',', 'tag delimiter' );
+        if ( ',' !== $comma ) {
+                $s = str_replace( $comma, ',', $s );
+        }
+        if ( false !== strpos( $s, ',' ) ) {
+                $s = explode( ',', $s );
+                $s = $s[ count( $s ) - 1 ];
+        }
+        $s = trim( $s );
+
+        /**
+         * Filters the minimum number of characters required to fire a tag search via Ajax.
+         *
+         * @since 4.0.0
+         *
+         * @param int         $characters The minimum number of characters required. Default 2.
+         * @param WP_Taxonomy $tax        The taxonomy object.
+         * @param string      $s          The search term.
+         */
+        $term_search_min_chars = (int) apply_filters( 'term_search_min_chars', 2, $tax, $s );
+
+        /*
+         * Require $term_search_min_chars chars for matching (default: 2)
+         * ensure it's a non-negative, non-zero integer.
+         */
+        if ( ( $term_search_min_chars == 0 ) || ( strlen( $s ) < $term_search_min_chars ) ) {
+                wp_die();
+        }
+
+        $results = get_terms(
+                $taxonomy,
+                array(
+                        'name__like' => $s,
+                        'fields'     => 'names',
+                        'hide_empty' => false,
+                )
+        );
+
+        echo join( $results, "\n" );
+        wp_die();
 }
 

trunk/src/wp-admin/includes/deprecated.php

@@ -1515 +1515 @@
         <?php
 }
-
-/**
- * Ajax handler for tag search.
- *
- * @since 3.1.0
- * @deprecated 5.0.0 Use the REST API tags endpoint instead.
- */
-function wp_ajax_ajax_tag_search() {
-        _deprecated_function( __FUNCTION__, '5.0.0', '/wp-json/wp/v2/tags' );
-
-        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 );
-        }
-
-        $s = wp_unslash( $_GET['q'] );
-
-        $comma = _x( ',', 'tag delimiter' );
-        if ( ',' !== $comma ) {
-                $s = str_replace( $comma, ',', $s );
-        }
-        if ( false !== strpos( $s, ',' ) ) {
-                $s = explode( ',', $s );
-                $s = $s[ count( $s ) - 1 ];
-        }
-        $s = trim( $s );
-
-        /** This filter is documented in wp-includes/script-loader.php */
-        $term_search_min_chars = (int) apply_filters( 'term_search_min_chars', 2, $tax, $s );
-
-        /*
-         * Require $term_search_min_chars chars for matching (default: 2)
-         * ensure it's a non-negative, non-zero integer.
-         */
-        if ( ( $term_search_min_chars == 0 ) || ( strlen( $s ) < $term_search_min_chars ) ) {
-                wp_die();
-        }
-
-        $results = get_terms(
-                $taxonomy, array(
-                        'name__like' => $s,
-                        'fields'     => 'names',
-                        'hide_empty' => false,
-                )
-        );
-
-        echo join( $results, "\n" );
-        wp_die();
-}