X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/8d3bb1a5dcfdea9857d3c88c3751f09593e34dc8..ef91a7f4f3c6468973e192335a27ec0e0faca0b5:/wp-includes/taxonomy.php diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php index 70af35a3..f5c2f386 100644 --- a/wp-includes/taxonomy.php +++ b/wp-includes/taxonomy.php @@ -61,6 +61,15 @@ function create_initial_taxonomies() { 'show_ui' => true, 'show_admin_column' => true, '_builtin' => true, + 'capabilities' => array( + 'manage_terms' => 'manage_categories', + 'edit_terms' => 'edit_categories', + 'delete_terms' => 'delete_categories', + 'assign_terms' => 'assign_categories', + ), + 'show_in_rest' => true, + 'rest_base' => 'categories', + 'rest_controller_class' => 'WP_REST_Terms_Controller', ) ); register_taxonomy( 'post_tag', 'post', array( @@ -71,6 +80,15 @@ function create_initial_taxonomies() { 'show_ui' => true, 'show_admin_column' => true, '_builtin' => true, + 'capabilities' => array( + 'manage_terms' => 'manage_post_tags', + 'edit_terms' => 'edit_post_tags', + 'delete_terms' => 'delete_post_tags', + 'assign_terms' => 'assign_post_tags', + ), + 'show_in_rest' => true, + 'rest_base' => 'tags', + 'rest_controller_class' => 'WP_REST_Terms_Controller', ) ); register_taxonomy( 'nav_menu', 'nav_menu_item', array( @@ -181,7 +199,7 @@ function get_object_taxonomies( $object, $output = 'names' ) { if ( is_object($object) ) { if ( $object->post_type == 'attachment' ) - return get_attachment_taxonomies($object); + return get_attachment_taxonomies( $object, $output ); $object = $object->post_type; } @@ -211,7 +229,7 @@ function get_object_taxonomies( $object, $output = 'names' ) { * @global array $wp_taxonomies The registered taxonomies. * * @param string $taxonomy Name of taxonomy object to return. - * @return object|false The Taxonomy Object or false if $taxonomy doesn't exist. + * @return WP_Taxonomy|false The Taxonomy Object or false if $taxonomy doesn't exist. */ function get_taxonomy( $taxonomy ) { global $wp_taxonomies; @@ -276,21 +294,20 @@ function is_taxonomy_hierarchical($taxonomy) { * @since 4.4.0 The `show_ui` argument is now enforced on the term editing screen. * @since 4.4.0 The `public` argument now controls whether the taxonomy can be queried on the front end. * @since 4.5.0 Introduced `publicly_queryable` argument. + * @since 4.7.0 Introduced `show_in_rest`, 'rest_base' and 'rest_controller_class' + * arguments to register the Taxonomy in REST API. * * @global array $wp_taxonomies Registered taxonomies. - * @global WP $wp WP instance. * * @param string $taxonomy Taxonomy key, must not exceed 32 characters. - * @param array|string $object_type Name of the object type for the taxonomy object. + * @param array|string $object_type Object type or array of object types with which the taxonomy should be associated. * @param array|string $args { * Optional. Array or query string of arguments for registering a taxonomy. * - * @type string $label Name of the taxonomy shown in the menu. Usually plural. If not set, - * `$labels['name']` will be used. - * @type array $labels An array of labels for this taxonomy. By default, Tag labels are used for - * non-hierarchical taxonmies, and Category labels are used for hierarchical - * taxonomies. See accepted values in get_taxonomy_labels(). - * Default empty array. + * @type array $labels An array of labels for this taxonomy. By default, Tag labels are + * used for non-hierarchical taxonomies, and Category labels are used + * for hierarchical taxonomies. See accepted values in + * get_taxonomy_labels(). Default empty array. * @type string $description A short descriptive summary of what the taxonomy is for. Default empty. * @type bool $public Whether a taxonomy is intended for use publicly either via * the admin interface or by front-end users. The default settings @@ -308,6 +325,9 @@ function is_taxonomy_hierarchical($taxonomy) { * (default true). * @type bool $show_in_nav_menus Makes this taxonomy available for selection in navigation menus. If not * set, the default is inherited from `$public` (default true). + * @type bool $show_in_rest Whether to include the taxonomy in the REST API. + * @type string $rest_base To change the base url of REST API route. Default is $taxonomy. + * @type string $rest_controller_class REST API Controller class name. Default is 'WP_REST_Terms_Controller'. * @type bool $show_tagcloud Whether to list the taxonomy in the Tag Cloud Widget controls. If not set, * the default is inherited from `$show_ui` (default true). * @type bool $show_in_quick_edit Whether to show the taxonomy in the quick/bulk edit panel. It not set, @@ -349,134 +369,25 @@ function is_taxonomy_hierarchical($taxonomy) { * @return WP_Error|void WP_Error, if errors. */ function register_taxonomy( $taxonomy, $object_type, $args = array() ) { - global $wp_taxonomies, $wp; + global $wp_taxonomies; if ( ! is_array( $wp_taxonomies ) ) $wp_taxonomies = array(); $args = wp_parse_args( $args ); - /** - * Filters the arguments for registering a taxonomy. - * - * @since 4.4.0 - * - * @param array $args Array of arguments for registering a taxonomy. - * @param string $taxonomy Taxonomy key. - * @param array $object_type Array of names of object types for the taxonomy. - */ - $args = apply_filters( 'register_taxonomy_args', $args, $taxonomy, (array) $object_type ); - - $defaults = array( - 'labels' => array(), - 'description' => '', - 'public' => true, - 'publicly_queryable' => null, - 'hierarchical' => false, - 'show_ui' => null, - 'show_in_menu' => null, - 'show_in_nav_menus' => null, - 'show_tagcloud' => null, - 'show_in_quick_edit' => null, - 'show_admin_column' => false, - 'meta_box_cb' => null, - 'capabilities' => array(), - 'rewrite' => true, - 'query_var' => $taxonomy, - 'update_count_callback' => '', - '_builtin' => false, - ); - $args = array_merge( $defaults, $args ); - if ( empty( $taxonomy ) || strlen( $taxonomy ) > 32 ) { _doing_it_wrong( __FUNCTION__, __( 'Taxonomy names must be between 1 and 32 characters in length.' ), '4.2.0' ); return new WP_Error( 'taxonomy_length_invalid', __( 'Taxonomy names must be between 1 and 32 characters in length.' ) ); } - // If not set, default to the setting for public. - if ( null === $args['publicly_queryable'] ) { - $args['publicly_queryable'] = $args['public']; - } + $taxonomy_object = new WP_Taxonomy( $taxonomy, $object_type, $args ); + $taxonomy_object->add_rewrite_rules(); - // Non-publicly queryable taxonomies should not register query vars, except in the admin. - if ( false !== $args['query_var'] && ( is_admin() || false !== $args['publicly_queryable'] ) && ! empty( $wp ) ) { - if ( true === $args['query_var'] ) - $args['query_var'] = $taxonomy; - else - $args['query_var'] = sanitize_title_with_dashes( $args['query_var'] ); - $wp->add_query_var( $args['query_var'] ); - } else { - // Force query_var to false for non-public taxonomies. - $args['query_var'] = false; - } - - if ( false !== $args['rewrite'] && ( is_admin() || '' != get_option( 'permalink_structure' ) ) ) { - $args['rewrite'] = wp_parse_args( $args['rewrite'], array( - 'with_front' => true, - 'hierarchical' => false, - 'ep_mask' => EP_NONE, - ) ); + $wp_taxonomies[ $taxonomy ] = $taxonomy_object; - if ( empty( $args['rewrite']['slug'] ) ) - $args['rewrite']['slug'] = sanitize_title_with_dashes( $taxonomy ); - - if ( $args['hierarchical'] && $args['rewrite']['hierarchical'] ) - $tag = '(.+?)'; - else - $tag = '([^/]+)'; - - add_rewrite_tag( "%$taxonomy%", $tag, $args['query_var'] ? "{$args['query_var']}=" : "taxonomy=$taxonomy&term=" ); - add_permastruct( $taxonomy, "{$args['rewrite']['slug']}/%$taxonomy%", $args['rewrite'] ); - } + $taxonomy_object->add_hooks(); - // If not set, default to the setting for public. - if ( null === $args['show_ui'] ) - $args['show_ui'] = $args['public']; - - // If not set, default to the setting for show_ui. - if ( null === $args['show_in_menu' ] || ! $args['show_ui'] ) - $args['show_in_menu' ] = $args['show_ui']; - - // If not set, default to the setting for public. - if ( null === $args['show_in_nav_menus'] ) - $args['show_in_nav_menus'] = $args['public']; - - // If not set, default to the setting for show_ui. - if ( null === $args['show_tagcloud'] ) - $args['show_tagcloud'] = $args['show_ui']; - - // If not set, default to the setting for show_ui. - if ( null === $args['show_in_quick_edit'] ) { - $args['show_in_quick_edit'] = $args['show_ui']; - } - - $default_caps = array( - 'manage_terms' => 'manage_categories', - 'edit_terms' => 'manage_categories', - 'delete_terms' => 'manage_categories', - 'assign_terms' => 'edit_posts', - ); - $args['cap'] = (object) array_merge( $default_caps, $args['capabilities'] ); - unset( $args['capabilities'] ); - - $args['name'] = $taxonomy; - $args['object_type'] = array_unique( (array) $object_type ); - - $args['labels'] = get_taxonomy_labels( (object) $args ); - $args['label'] = $args['labels']->name; - - // If not set, use the default meta box - if ( null === $args['meta_box_cb'] ) { - if ( $args['hierarchical'] ) - $args['meta_box_cb'] = 'post_categories_meta_box'; - else - $args['meta_box_cb'] = 'post_tags_meta_box'; - } - - $wp_taxonomies[ $taxonomy ] = (object) $args; - - // Register callback handling for meta box. - add_filter( 'wp_ajax_add-' . $taxonomy, '_wp_ajax_add_hierarchical_term' ); /** * Fires after a taxonomy is registered. @@ -487,7 +398,7 @@ function register_taxonomy( $taxonomy, $object_type, $args = array() ) { * @param array|string $object_type Object type or array of object types. * @param array $args Array of taxonomy registration arguments. */ - do_action( 'registered_taxonomy', $taxonomy, $object_type, $args ); + do_action( 'registered_taxonomy', $taxonomy, $object_type, (array) $taxonomy_object ); } /** @@ -508,28 +419,17 @@ function unregister_taxonomy( $taxonomy ) { return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) ); } - $taxonomy_args = get_taxonomy( $taxonomy ); + $taxonomy_object = get_taxonomy( $taxonomy ); // Do not allow unregistering internal taxonomies. - if ( $taxonomy_args->_builtin ) { + if ( $taxonomy_object->_builtin ) { return new WP_Error( 'invalid_taxonomy', __( 'Unregistering a built-in taxonomy is not allowed' ) ); } - global $wp, $wp_taxonomies; - - // Remove query var. - if ( false !== $taxonomy_args->query_var ) { - $wp->remove_query_var( $taxonomy_args->query_var ); - } - - // Remove rewrite tags and permastructs. - if ( false !== $taxonomy_args->rewrite ) { - remove_rewrite_tag( "%$taxonomy%" ); - remove_permastruct( $taxonomy ); - } + global $wp_taxonomies; - // Unregister callback handling for meta box. - remove_filter( 'wp_ajax_add-' . $taxonomy, '_wp_ajax_add_hierarchical_term' ); + $taxonomy_object->remove_rewrite_rules(); + $taxonomy_object->remove_hooks(); // Remove the taxonomy. unset( $wp_taxonomies[ $taxonomy ] ); @@ -579,7 +479,7 @@ function unregister_taxonomy( $taxonomy ) { * @since 4.3.0 Added the `no_terms` label. * @since 4.4.0 Added the `items_list_navigation` and `items_list` labels. * - * @param object $tax Taxonomy object. + * @param WP_Taxonomy $tax Taxonomy object. * @return object object with all the labels as member variables. */ function get_taxonomy_labels( $tax ) { @@ -814,7 +714,8 @@ function get_tax_sql( $tax_query, $primary_table, $primary_id_column ) { * filters and return a `WP_Term` object corresponding to the `$term` data. If `WP_Term`, * will return `$term`. * @param string $taxonomy Optional. Taxonomy name that $term is part of. - * @param string $output Constant OBJECT, ARRAY_A, or ARRAY_N + * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which correspond to + * a WP_Term object, an associative array, or a numeric array, respectively. Default OBJECT. * @param string $filter Optional, default is raw or no WordPress defined filter will applied. * @return array|WP_Term|WP_Error|null Object of the type specified by `$output` on success. When `$output` is 'OBJECT', * a WP_Term instance is returned. If taxonomy does not exist, a WP_Error is @@ -871,7 +772,7 @@ function get_term( $term, $taxonomy = '', $output = OBJECT, $filter = 'raw' ) { * @param int|WP_Term $_term Term object or ID. * @param string $taxonomy The taxonomy slug. */ - $_term = apply_filters( "get_$taxonomy", $_term, $taxonomy ); + $_term = apply_filters( "get_{$taxonomy}", $_term, $taxonomy ); // Bail if a filter callback has changed the type of the `$_term` object. if ( ! ( $_term instanceof WP_Term ) ) { @@ -921,10 +822,11 @@ function get_term( $term, $taxonomy = '', $output = OBJECT, $filter = 'raw' ) { * @param string $field Either 'slug', 'name', 'id' (term_id), or 'term_taxonomy_id' * @param string|int $value Search for this term value * @param string $taxonomy Taxonomy name. Optional, if `$field` is 'term_taxonomy_id'. - * @param string $output Constant OBJECT, ARRAY_A, or ARRAY_N + * @param string $output Optional. The required return type. One of OBJECT, ARRAY_A, or ARRAY_N, which correspond to + * a WP_Term object, an associative array, or a numeric array, respectively. Default OBJECT. * @param string $filter Optional, default is raw or no WordPress defined filter will applied. - * @return WP_Term|bool WP_Term instance on success. Will return false if `$taxonomy` does not exist - * or `$term` was not found. + * @return WP_Term|array|false WP_Term instance (or array) on success. Will return false if `$taxonomy` does not exist + * or `$term` was not found. */ function get_term_by( $field, $value, $taxonomy = '', $output = OBJECT, $filter = 'raw' ) { global $wpdb; @@ -1379,7 +1281,7 @@ function update_termmeta_cache( $term_ids ) { * * @global wpdb $wpdb WordPress database abstraction object. * - * @param int|string $term The term to check + * @param int|string $term The term to check. Accepts term ID, slug, or name. * @param string $taxonomy The taxonomy name to use * @param int $parent Optional. ID of parent term under which to confine the exists search. * @return mixed Returns null if the term does not exist. Returns the term ID @@ -1915,7 +1817,7 @@ function wp_delete_term( $term, $taxonomy, $args = array() ) { * by the parent function. WP_Error otherwise. * @param array $object_ids List of term object IDs. */ - do_action( "delete_$taxonomy", $term, $tt_id, $deleted_term, $object_ids ); + do_action( "delete_{$taxonomy}", $term, $tt_id, $deleted_term, $object_ids ); return true; } @@ -1941,27 +1843,13 @@ function wp_delete_category( $cat_ID ) { * Introduced `$parent` argument. * @since 4.4.0 Introduced `$meta_query` and `$update_term_meta_cache` arguments. When `$fields` is 'all' or * 'all_with_object_id', an array of `WP_Term` objects will be returned. + * @since 4.7.0 Refactored to use WP_Term_Query, and to support any WP_Term_Query arguments. * * @global wpdb $wpdb WordPress database abstraction object. * * @param int|array $object_ids The ID(s) of the object(s) to retrieve. * @param string|array $taxonomies The taxonomies to retrieve terms from. - * @param array|string $args { - * Array of arguments. - * @type string $orderby Field by which results should be sorted. Accepts 'name', 'count', 'slug', - * 'term_group', 'term_order', 'taxonomy', 'parent', or 'term_taxonomy_id'. - * Default 'name'. - * @type string $order Sort order. Accepts 'ASC' or 'DESC'. Default 'ASC'. - * @type string $fields Fields to return for matched terms. Accepts 'all', 'ids', 'names', and - * 'all_with_object_id'. Note that 'all' or 'all_with_object_id' will result - * in an array of term objects being returned, 'ids' will return an array of - * integers, and 'names' an array of strings. - * @type int $parent Optional. Limit results to the direct children of a given term ID. - * @type bool $update_term_meta_cache Whether to prime termmeta cache for matched terms. Only applies when - * `$fields` is 'all', 'all_with_object_id', or 'term_id'. Default true. - * @type array $meta_query Meta query clauses to limit retrieved terms by. See `WP_Meta_Query`. - * Default empty. - * } + * @param array|string $args See WP_Term_Query::__construct() for supported arguments. * @return array|WP_Error The requested term data or empty array if no terms found. * WP_Error if any of the $taxonomies don't exist. */ @@ -1983,185 +1871,26 @@ function wp_get_object_terms($object_ids, $taxonomies, $args = array()) { $object_ids = array($object_ids); $object_ids = array_map('intval', $object_ids); - $defaults = array( - 'orderby' => 'name', - 'order' => 'ASC', - 'fields' => 'all', - 'parent' => '', - 'update_term_meta_cache' => true, - 'meta_query' => '', - ); - $args = wp_parse_args( $args, $defaults ); - - $terms = array(); - if ( count($taxonomies) > 1 ) { - foreach ( $taxonomies as $index => $taxonomy ) { - $t = get_taxonomy($taxonomy); - if ( isset($t->args) && is_array($t->args) && $args != array_merge($args, $t->args) ) { - unset($taxonomies[$index]); - $terms = array_merge($terms, wp_get_object_terms($object_ids, $taxonomy, array_merge($args, $t->args))); - } - } - } else { - $t = get_taxonomy($taxonomies[0]); - if ( isset($t->args) && is_array($t->args) ) - $args = array_merge($args, $t->args); - } - - $orderby = $args['orderby']; - $order = $args['order']; - $fields = $args['fields']; - - if ( in_array( $orderby, array( 'term_id', 'name', 'slug', 'term_group' ) ) ) { - $orderby = "t.$orderby"; - } elseif ( in_array( $orderby, array( 'count', 'parent', 'taxonomy', 'term_taxonomy_id' ) ) ) { - $orderby = "tt.$orderby"; - } elseif ( 'term_order' === $orderby ) { - $orderby = 'tr.term_order'; - } elseif ( 'none' === $orderby ) { - $orderby = ''; - $order = ''; - } else { - $orderby = 't.term_id'; - } - - // tt_ids queries can only be none or tr.term_taxonomy_id - if ( ('tt_ids' == $fields) && !empty($orderby) ) - $orderby = 'tr.term_taxonomy_id'; - - if ( !empty($orderby) ) - $orderby = "ORDER BY $orderby"; - - $order = strtoupper( $order ); - if ( '' !== $order && ! in_array( $order, array( 'ASC', 'DESC' ) ) ) - $order = 'ASC'; - - $taxonomy_array = $taxonomies; - $object_id_array = $object_ids; - $taxonomies = "'" . implode("', '", array_map( 'esc_sql', $taxonomies ) ) . "'"; - $object_ids = implode(', ', $object_ids); - - $select_this = ''; - if ( 'all' == $fields ) { - $select_this = 't.*, tt.*'; - } elseif ( 'ids' == $fields ) { - $select_this = 't.term_id'; - } elseif ( 'names' == $fields ) { - $select_this = 't.name'; - } elseif ( 'slugs' == $fields ) { - $select_this = 't.slug'; - } elseif ( 'all_with_object_id' == $fields ) { - $select_this = 't.*, tt.*, tr.object_id'; - } - - $where = array( - "tt.taxonomy IN ($taxonomies)", - "tr.object_id IN ($object_ids)", - ); - - if ( '' !== $args['parent'] ) { - $where[] = $wpdb->prepare( 'tt.parent = %d', $args['parent'] ); - } - - // Meta query support. - $meta_query_join = ''; - if ( ! empty( $args['meta_query'] ) ) { - $mquery = new WP_Meta_Query( $args['meta_query'] ); - $mq_sql = $mquery->get_sql( 'term', 't', 'term_id' ); - - $meta_query_join .= $mq_sql['join']; - - // Strip leading AND. - $where[] = preg_replace( '/^\s*AND/', '', $mq_sql['where'] ); - } - - $where = implode( ' AND ', $where ); - - $query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id INNER JOIN $wpdb->term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id $meta_query_join WHERE $where $orderby $order"; - - $objects = false; - if ( 'all' == $fields || 'all_with_object_id' == $fields ) { - $_terms = $wpdb->get_results( $query ); - $object_id_index = array(); - foreach ( $_terms as $key => $term ) { - $term = sanitize_term( $term, $taxonomy, 'raw' ); - $_terms[ $key ] = $term; + $args['taxonomy'] = $taxonomies; + $args['object_ids'] = $object_ids; - if ( isset( $term->object_id ) ) { - $object_id_index[ $key ] = $term->object_id; - } - } - - update_term_cache( $_terms ); - $_terms = array_map( 'get_term', $_terms ); - - // Re-add the object_id data, which is lost when fetching terms from cache. - if ( 'all_with_object_id' === $fields ) { - foreach ( $_terms as $key => $_term ) { - if ( isset( $object_id_index[ $key ] ) ) { - $_term->object_id = $object_id_index[ $key ]; - } - } - } - - $terms = array_merge( $terms, $_terms ); - $objects = true; - - } elseif ( 'ids' == $fields || 'names' == $fields || 'slugs' == $fields ) { - $_terms = $wpdb->get_col( $query ); - $_field = ( 'ids' == $fields ) ? 'term_id' : 'name'; - foreach ( $_terms as $key => $term ) { - $_terms[$key] = sanitize_term_field( $_field, $term, $term, $taxonomy, 'raw' ); - } - $terms = array_merge( $terms, $_terms ); - } elseif ( 'tt_ids' == $fields ) { - $terms = $wpdb->get_col("SELECT tr.term_taxonomy_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tr.object_id IN ($object_ids) AND tt.taxonomy IN ($taxonomies) $orderby $order"); - foreach ( $terms as $key => $tt_id ) { - $terms[$key] = sanitize_term_field( 'term_taxonomy_id', $tt_id, 0, $taxonomy, 'raw' ); // 0 should be the term id, however is not needed when using raw context. - } - } - - // Update termmeta cache, if necessary. - if ( $args['update_term_meta_cache'] && ( 'all' === $fields || 'all_with_object_id' === $fields || 'ids' === $fields ) ) { - if ( 'ids' === $fields ) { - $term_ids = $terms; - } else { - $term_ids = wp_list_pluck( $terms, 'term_id' ); - } - - update_termmeta_cache( $term_ids ); - } - - if ( ! $terms ) { - $terms = array(); - } elseif ( $objects && 'all_with_object_id' !== $fields ) { - $_tt_ids = array(); - $_terms = array(); - foreach ( $terms as $term ) { - if ( in_array( $term->term_taxonomy_id, $_tt_ids ) ) { - continue; - } - - $_tt_ids[] = $term->term_taxonomy_id; - $_terms[] = $term; - } - $terms = $_terms; - } elseif ( ! $objects ) { - $terms = array_values( array_unique( $terms ) ); - } + $terms = get_terms( $args ); /** * Filters the terms for a given object or objects. * * @since 4.2.0 * - * @param array $terms An array of terms for the given object or objects. - * @param array $object_id_array Array of object IDs for which `$terms` were retrieved. - * @param array $taxonomy_array Array of taxonomies from which `$terms` were retrieved. - * @param array $args An array of arguments for retrieving terms for the given - * object(s). See wp_get_object_terms() for details. + * @param array $terms An array of terms for the given object or objects. + * @param array $object_ids Array of object IDs for which `$terms` were retrieved. + * @param array $taxonomies Array of taxonomies from which `$terms` were retrieved. + * @param array $args An array of arguments for retrieving terms for the given + * object(s). See wp_get_object_terms() for details. */ - $terms = apply_filters( 'get_object_terms', $terms, $object_id_array, $taxonomy_array, $args ); + $terms = apply_filters( 'get_object_terms', $terms, $object_ids, $taxonomies, $args ); + + $object_ids = implode( ',', $object_ids ); + $taxonomies = implode( ',', $taxonomies ); /** * Filters the terms for a given object or objects. @@ -2340,7 +2069,20 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) { $slug = wp_unique_term_slug( $slug, (object) $args ); - if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) ) { + $data = compact( 'name', 'slug', 'term_group' ); + + /** + * Filters term data before it is inserted into the database. + * + * @since 4.7.0 + * + * @param array $data Term data to be inserted. + * @param string $taxonomy Taxonomy slug. + * @param array $args Arguments passed to wp_insert_term(). + */ + $data = apply_filters( 'wp_insert_term_data', $data, $taxonomy, $args ); + + if ( false === $wpdb->insert( $wpdb->terms, $data ) ) { return new WP_Error( 'db_insert_error', __( 'Could not insert term into the database' ), $wpdb->last_error ); } @@ -2406,7 +2148,7 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) { * @param int $term_id Term ID. * @param int $tt_id Term taxonomy ID. */ - do_action( "create_$taxonomy", $term_id, $tt_id ); + do_action( "create_{$taxonomy}", $term_id, $tt_id ); /** * Filters the term ID after a new term is created. @@ -2442,7 +2184,7 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) { * @param int $term_id Term ID. * @param int $tt_id Term taxonomy ID. */ - do_action( "created_$taxonomy", $term_id, $tt_id ); + do_action( "created_{$taxonomy}", $term_id, $tt_id ); return array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id); } @@ -2513,22 +2255,26 @@ function wp_set_object_terms( $object_id, $terms, $taxonomy, $append = false ) { * Fires immediately before an object-term relationship is added. * * @since 2.9.0 + * @since 4.7.0 Added the `$taxonomy` parameter. * - * @param int $object_id Object ID. - * @param int $tt_id Term taxonomy ID. + * @param int $object_id Object ID. + * @param int $tt_id Term taxonomy ID. + * @param string $taxonomy Taxonomy slug. */ - do_action( 'add_term_relationship', $object_id, $tt_id ); + do_action( 'add_term_relationship', $object_id, $tt_id, $taxonomy ); $wpdb->insert( $wpdb->term_relationships, array( 'object_id' => $object_id, 'term_taxonomy_id' => $tt_id ) ); /** * Fires immediately after an object-term relationship is added. * * @since 2.9.0 + * @since 4.7.0 Added the `$taxonomy` parameter. * - * @param int $object_id Object ID. - * @param int $tt_id Term taxonomy ID. + * @param int $object_id Object ID. + * @param int $tt_id Term taxonomy ID. + * @param string $taxonomy Taxonomy slug. */ - do_action( 'added_term_relationship', $object_id, $tt_id ); + do_action( 'added_term_relationship', $object_id, $tt_id, $taxonomy ); $new_tt_ids[] = $tt_id; } @@ -2648,11 +2394,13 @@ function wp_remove_object_terms( $object_id, $terms, $taxonomy ) { * Fires immediately before an object-term relationship is deleted. * * @since 2.9.0 + * @since 4.7.0 Added the `$taxonomy` parameter. * * @param int $object_id Object ID. * @param array $tt_ids An array of term taxonomy IDs. + * @param string $taxonomy Taxonomy slug. */ - do_action( 'delete_term_relationships', $object_id, $tt_ids ); + do_action( 'delete_term_relationships', $object_id, $tt_ids, $taxonomy ); $deleted = $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id IN ($in_tt_ids)", $object_id ) ); wp_cache_delete( $object_id, $taxonomy . '_relationships' ); @@ -2661,11 +2409,13 @@ function wp_remove_object_terms( $object_id, $terms, $taxonomy ) { * Fires immediately after an object-term relationship is deleted. * * @since 2.9.0 + * @since 4.7.0 Added the `$taxonomy` parameter. * - * @param int $object_id Object ID. - * @param array $tt_ids An array of term taxonomy IDs. + * @param int $object_id Object ID. + * @param array $tt_ids An array of term taxonomy IDs. + * @param string $taxonomy Taxonomy slug. */ - do_action( 'deleted_term_relationships', $object_id, $tt_ids ); + do_action( 'deleted_term_relationships', $object_id, $tt_ids, $taxonomy ); wp_update_term_count( $tt_ids, $taxonomy ); @@ -2904,10 +2654,12 @@ function wp_update_term( $term_id, $taxonomy, $args = array() ) { if ( $duplicate && $duplicate->term_id != $term_id ) { // If an empty slug was passed or the parent changed, reset the slug to something unique. // Otherwise, bail. - if ( $empty_slug || ( $parent != $term['parent']) ) + if ( $empty_slug || ( $parent != $term['parent']) ) { $slug = wp_unique_term_slug($slug, (object) $args); - else + } else { + /* translators: 1: Taxonomy term slug */ return new WP_Error('duplicate_term_slug', sprintf(__('The slug “%s” is already in use by another term'), $slug)); + } } $tt_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT tt.term_taxonomy_id FROM $wpdb->term_taxonomy AS tt INNER JOIN $wpdb->terms AS t ON tt.term_id = t.term_id WHERE tt.taxonomy = %s AND t.term_id = %d", $taxonomy, $term_id) ); @@ -2927,7 +2679,22 @@ function wp_update_term( $term_id, $taxonomy, $args = array() ) { * @param string $taxonomy Taxonomy slug. */ do_action( 'edit_terms', $term_id, $taxonomy ); - $wpdb->update($wpdb->terms, compact( 'name', 'slug', 'term_group' ), compact( 'term_id' ) ); + + $data = compact( 'name', 'slug', 'term_group' ); + + /** + * Filters term data before it is updated in the database. + * + * @since 4.7.0 + * + * @param array $data Term data to be updated. + * @param int $term_id Term ID. + * @param string $taxonomy Taxonomy slug. + * @param array $args Arguments passed to wp_update_term(). + */ + $data = apply_filters( 'wp_update_term_data', $data, $term_id, $taxonomy, $args ); + + $wpdb->update( $wpdb->terms, $data, compact( 'term_id' ) ); if ( empty($slug) ) { $slug = sanitize_title($name, $term_id); $wpdb->update( $wpdb->terms, compact( 'slug' ), compact( 'term_id' ) ); @@ -2987,7 +2754,7 @@ function wp_update_term( $term_id, $taxonomy, $args = array() ) { * @param int $term_id Term ID. * @param int $tt_id Term taxonomy ID. */ - do_action( "edit_$taxonomy", $term_id, $tt_id ); + do_action( "edit_{$taxonomy}", $term_id, $tt_id ); /** This filter is documented in wp-includes/taxonomy.php */ $term_id = apply_filters( 'term_id_filter', $term_id, $tt_id ); @@ -3016,7 +2783,7 @@ function wp_update_term( $term_id, $taxonomy, $args = array() ) { * @param int $term_id Term ID. * @param int $tt_id Term taxonomy ID. */ - do_action( "edited_$taxonomy", $term_id, $tt_id ); + do_action( "edited_{$taxonomy}", $term_id, $tt_id ); return array('term_id' => $term_id, 'term_taxonomy_id' => $tt_id); } @@ -3252,10 +3019,14 @@ function clean_term_cache($ids, $taxonomy = '', $clean_taxonomy = true) { * function only fetches relationship data that is already in the cache. * * @since 2.3.0 + * @since 4.7.0 Returns a WP_Error object if get_term() returns an error for + * any of the matched terms. * * @param int $id Term object ID. * @param string $taxonomy Taxonomy name. - * @return bool|array Array of `WP_Term` objects, if cached False if cache is empty for `$taxonomy` and `$id`. + * @return bool|array|WP_Error Array of `WP_Term` objects, if cached. + * False if cache is empty for `$taxonomy` and `$id`. + * WP_Error if get_term() returns an error object for any term. */ function get_object_term_cache( $id, $taxonomy ) { $_term_ids = wp_cache_get( $id, "{$taxonomy}_relationships" ); @@ -3280,10 +3051,15 @@ function get_object_term_cache( $id, $taxonomy ) { $terms = array(); foreach ( $term_ids as $term_id ) { - $terms[] = wp_cache_get( $term_id, 'terms' ); + $term = get_term( $term_id, $taxonomy ); + if ( is_wp_error( $term ) ) { + return $term; + } + + $terms[] = $term; } - return array_map( 'get_term', $terms ); + return $terms; } /**