diff --git a/wp-admin/includes/ajax-actions.php b/wp-admin/includes/ajax-actions.php index 8ced5d335a..8861e154f0 100644 --- a/wp-admin/includes/ajax-actions.php +++ b/wp-admin/includes/ajax-actions.php @@ -99,69 +99,6 @@ function wp_ajax_fetch_list() { 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(); -} - /** * Ajax handler for compression testing. * diff --git a/wp-admin/includes/deprecated.php b/wp-admin/includes/deprecated.php index e65fe5a79c..f6e249ca5e 100644 --- a/wp-admin/includes/deprecated.php +++ b/wp-admin/includes/deprecated.php @@ -1514,3 +1514,61 @@ function options_permalink_add_js() { 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(); +} diff --git a/wp-admin/js/tags-suggest.js b/wp-admin/js/tags-suggest.js index 6465cc9959..0505988302 100644 --- a/wp-admin/js/tags-suggest.js +++ b/wp-admin/js/tags-suggest.js @@ -53,33 +53,15 @@ term = getLast( request.term ); - $.get( window.ajaxurl, { - action: 'ajax-tag-search', - tax: taxonomy, - q: term + $.get( window.tagsSuggestL10n.restURL, { + _fields: [ 'id', 'name' ], + taxonomy: taxonomy, + search: term } ).always( function() { $element.removeClass( 'ui-autocomplete-loading' ); // UI fails to remove this sometimes? } ).done( function( 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 ); - } + cache = data; + response( data ); } ); last = request.term; @@ -118,7 +100,7 @@ close: function() { $element.attr( 'aria-expanded', 'false' ); }, - minLength: 2, + minLength: window.tagsSuggestL10n.minChars, position: { my: 'left top+2', at: 'left bottom', diff --git a/wp-admin/js/tags-suggest.min.js b/wp-admin/js/tags-suggest.min.js index 984a8863b7..b701171e3e 100644 --- a/wp-admin/js/tags-suggest.min.js +++ b/wp-admin/js/tags-suggest.min.js @@ -1 +1 @@ -!function(a){function b(a){return a.split(new RegExp(e+"\\s*"))}function c(a){return b(a).pop()}if("undefined"!=typeof window.tagsSuggestL10n&&"undefined"!=typeof window.uiAutocompleteL10n){var d=0,e=window.tagsSuggestL10n.tagDelimiter||",";a.fn.wpTagsSuggest=function(f){var g,h,i=a(this);f=f||{};var j=f.taxonomy||i.attr("data-wp-taxonomy")||"post_tag";return delete f.taxonomy,f=a.extend({source:function(b,e){var f;return h===b.term?void e(g):(f=c(b.term),a.get(window.ajaxurl,{action:"ajax-tag-search",tax:j,q:f}).always(function(){i.removeClass("ui-autocomplete-loading")}).done(function(a){var b,c=[];if(a){a=a.split("\n");for(b in a){var f=++d;c.push({id:f,name:a[b]})}g=c,e(c)}else e(c)}),void(h=b.term))},focus:function(a,b){i.attr("aria-activedescendant","wp-tags-autocomplete-"+b.item.id),a.preventDefault()},select:function(c,d){var f=b(i.val());return f.pop(),f.push(d.item.name,""),i.val(f.join(e+" ")),a.ui.keyCode.TAB===c.keyCode?(window.wp.a11y.speak(window.tagsSuggestL10n.termSelected,"assertive"),c.preventDefault()):a.ui.keyCode.ENTER===c.keyCode&&(c.preventDefault(),c.stopPropagation()),!1},open:function(){i.attr("aria-expanded","true")},close:function(){i.attr("aria-expanded","false")},minLength:2,position:{my:"left top+2",at:"left bottom",collision:"none"},messages:{noResults:window.uiAutocompleteL10n.noResults,results:function(a){return a>1?window.uiAutocompleteL10n.manyResults.replace("%d",a):window.uiAutocompleteL10n.oneResult}}},f),i.on("keydown",function(){i.removeAttr("aria-activedescendant")}).autocomplete(f).autocomplete("instance")._renderItem=function(b,c){return a('
  • ').text(c.name).appendTo(b)},i.attr({role:"combobox","aria-autocomplete":"list","aria-expanded":"false","aria-owns":i.autocomplete("widget").attr("id")}).on("focus",function(){var a=b(i.val()).pop();a&&i.autocomplete("search")}).autocomplete("widget").addClass("wp-tags-autocomplete").attr("role","listbox").removeAttr("tabindex").on("menufocus",function(a,b){b.item.attr("aria-selected","true")}).on("menublur",function(){a(this).find('[aria-selected="true"]').removeAttr("aria-selected")}),this}}}(jQuery); \ No newline at end of file +!function(a){function b(a){return a.split(new RegExp(d+"\\s*"))}function c(a){return b(a).pop()}if("undefined"!=typeof window.tagsSuggestL10n&&"undefined"!=typeof window.uiAutocompleteL10n){var d=window.tagsSuggestL10n.tagDelimiter||",";a.fn.wpTagsSuggest=function(e){var f,g,h=a(this);e=e||{};var i=e.taxonomy||h.attr("data-wp-taxonomy")||"post_tag";return delete e.taxonomy,e=a.extend({source:function(b,d){var e;return g===b.term?void d(f):(e=c(b.term),a.get(window.tagsSuggestL10n.restURL,{_fields:["id","name"],taxonomy:i,search:e}).always(function(){h.removeClass("ui-autocomplete-loading")}).done(function(a){f=a,d(a)}),void(g=b.term))},focus:function(a,b){h.attr("aria-activedescendant","wp-tags-autocomplete-"+b.item.id),a.preventDefault()},select:function(c,e){var f=b(h.val());return f.pop(),f.push(e.item.name,""),h.val(f.join(d+" ")),a.ui.keyCode.TAB===c.keyCode?(window.wp.a11y.speak(window.tagsSuggestL10n.termSelected,"assertive"),c.preventDefault()):a.ui.keyCode.ENTER===c.keyCode&&(c.preventDefault(),c.stopPropagation()),!1},open:function(){h.attr("aria-expanded","true")},close:function(){h.attr("aria-expanded","false")},minLength:window.tagsSuggestL10n.minChars,position:{my:"left top+2",at:"left bottom",collision:"none"},messages:{noResults:window.uiAutocompleteL10n.noResults,results:function(a){return a>1?window.uiAutocompleteL10n.manyResults.replace("%d",a):window.uiAutocompleteL10n.oneResult}}},e),h.on("keydown",function(){h.removeAttr("aria-activedescendant")}).autocomplete(e).autocomplete("instance")._renderItem=function(b,c){return a('
  • ').text(c.name).appendTo(b)},h.attr({role:"combobox","aria-autocomplete":"list","aria-expanded":"false","aria-owns":h.autocomplete("widget").attr("id")}).on("focus",function(){var a=b(h.val()).pop();a&&h.autocomplete("search")}).autocomplete("widget").addClass("wp-tags-autocomplete").attr("role","listbox").removeAttr("tabindex").on("menufocus",function(a,b){b.item.attr("aria-selected","true")}).on("menublur",function(){a(this).find('[aria-selected="true"]').removeAttr("aria-selected")}),this}}}(jQuery); \ No newline at end of file diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index e0b63f44d3..98a5a0d1cc 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -726,6 +726,17 @@ function wp_default_scripts( &$scripts ) { 'termSelected' => __( 'Term selected.' ), 'termAdded' => __( 'Term added.' ), 'termRemoved' => __( 'Term removed.' ), + 'restURL' => rest_url( '/wp/v2/tags' ), + + /** + * Filters the minimum number of characters required to fire a tag search via Ajax. + * + * Previous to 4.8.0, this filter passed taxonomy and search context parameters. + * @since 4.0.0 + * + * @param int $characters The minimum number of characters required. Default 2. + */ + 'minChars' => (int) apply_filters( 'term_search_min_chars', 2 ), ) ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 6d9515bab6..fd9f0b4fb0 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '5.0-alpha-42613'; +$wp_version = '5.0-alpha-42614'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.