'rewrite' => $rewrite['category'],
'public' => true,
'show_ui' => true,
+ 'show_admin_column' => true,
'_builtin' => true,
) );
'rewrite' => $rewrite['post_tag'],
'public' => true,
'show_ui' => true,
+ 'show_admin_column' => true,
'_builtin' => true,
) );
'add_or_remove_items' => null,
'choose_from_most_used' => null,
),
+ 'capabilities' => array(
+ 'manage_terms' => 'manage_links',
+ 'edit_terms' => 'manage_links',
+ 'delete_terms' => 'manage_links',
+ 'assign_terms' => 'manage_links',
+ ),
'query_var' => false,
'rewrite' => false,
'public' => false,
* @param string $taxonomy Name of taxonomy object
* @param array|string $object_type Name of the object type for the taxonomy object.
* @param array|string $args See above description for the two keys values.
+ * @return null|WP_Error WP_Error if errors, otherwise null.
*/
function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
global $wp_taxonomies, $wp;
if ( ! is_array($wp_taxonomies) )
$wp_taxonomies = array();
- $defaults = array( 'hierarchical' => false,
- 'update_count_callback' => '',
- 'rewrite' => true,
- 'query_var' => $taxonomy,
- 'public' => true,
- 'show_ui' => null,
- 'show_tagcloud' => null,
- '_builtin' => false,
- 'labels' => array(),
- 'capabilities' => array(),
- 'show_in_nav_menus' => null,
- );
+ $defaults = array(
+ 'hierarchical' => false,
+ 'update_count_callback' => '',
+ 'rewrite' => true,
+ 'query_var' => $taxonomy,
+ 'public' => true,
+ 'show_ui' => null,
+ 'show_tagcloud' => null,
+ '_builtin' => false,
+ 'labels' => array(),
+ 'capabilities' => array(),
+ 'show_in_nav_menus' => null,
+ );
$args = wp_parse_args($args, $defaults);
+ if ( strlen( $taxonomy ) > 32 )
+ return new WP_Error( 'taxonomy_too_long', __( 'Taxonomies cannot exceed 32 characters in length' ) );
+
if ( false !== $args['query_var'] && !empty($wp) ) {
if ( true === $args['query_var'] )
$args['query_var'] = $taxonomy;
- $args['query_var'] = sanitize_title_with_dashes($args['query_var']);
+ else
+ $args['query_var'] = sanitize_title_with_dashes($args['query_var']);
$wp->add_query_var($args['query_var']);
}
* - separate_items_with_commas - This string isn't used on hierarchical taxonomies. Default is "Separate tags with commas", used in the meta box.
* - add_or_remove_items - This string isn't used on hierarchical taxonomies. Default is "Add or remove tags", used in the meta box when JavaScript is disabled.
* - choose_from_most_used - This string isn't used on hierarchical taxonomies. Default is "Choose from the most used tags", used in the meta box.
+ * - not_found - This string isn't used on hierarchical taxonomies. Default is "No tags found", used in the meta box.
*
* Above, the first default value is for non-hierarchical taxonomies (like tags) and the second one is for hierarchical taxonomies (like categories).
*
if ( isset( $tax->helps ) && empty( $tax->labels['separate_items_with_commas'] ) )
$tax->labels['separate_items_with_commas'] = $tax->helps;
+ if ( isset( $tax->no_tagcloud ) && empty( $tax->labels['not_found'] ) )
+ $tax->labels['not_found'] = $tax->no_tagcloud;
+
$nohier_vs_hier_defaults = array(
'name' => array( _x( 'Tags', 'taxonomy general name' ), _x( 'Categories', 'taxonomy general name' ) ),
'singular_name' => array( _x( 'Tag', 'taxonomy singular name' ), _x( 'Category', 'taxonomy singular name' ) ),
'separate_items_with_commas' => array( __( 'Separate tags with commas' ), null ),
'add_or_remove_items' => array( __( 'Add or remove tags' ), null ),
'choose_from_most_used' => array( __( 'Choose from the most used tags' ), null ),
+ 'not_found' => array( __( 'No tags found.' ), null ),
);
$nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];
$join = '';
$where = array();
$i = 0;
+ $count = count( $this->queries );
- foreach ( $this->queries as $query ) {
+ foreach ( $this->queries as $index => $query ) {
$this->clean_query( $query );
- if ( is_wp_error( $query ) ) {
+ if ( is_wp_error( $query ) )
return self::$no_results;
- }
extract( $query );
if ( 'IN' == $operator ) {
if ( empty( $terms ) ) {
- if ( 'OR' == $this->relation )
+ if ( 'OR' == $this->relation ) {
+ if ( ( $index + 1 === $count ) && empty( $where ) )
+ return self::$no_results;
continue;
- else
+ } else {
return self::$no_results;
+ }
}
$terms = implode( ',', $terms );
$i++;
}
- if ( !empty( $where ) )
+ if ( ! empty( $where ) )
$where = ' AND ( ' . implode( " $this->relation ", $where ) . ' )';
else
$where = '';
* Transforms a single query, from one field to another.
*
* @since 3.2.0
- * @access private
*
* @param array &$query The single query
* @param string $resulting_field The resulting field
*/
- private function transform_query( &$query, $resulting_field ) {
+ public function transform_query( &$query, $resulting_field ) {
global $wpdb;
if ( empty( $query['terms'] ) )
if ( $query['field'] == $resulting_field )
return;
- $resulting_field = esc_sql( $resulting_field );
+ $resulting_field = sanitize_key( $resulting_field );
switch ( $query['field'] ) {
case 'slug':
AND $wpdb->terms.{$query['field']} IN ($terms)
" );
break;
-
+ case 'term_taxonomy_id':
+ $terms = implode( ',', array_map( 'intval', $query['terms'] ) );
+ $terms = $wpdb->get_col( "
+ SELECT $resulting_field
+ FROM $wpdb->term_taxonomy
+ WHERE term_taxonomy_id IN ($terms)
+ " );
+ break;
default:
$terms = implode( ',', array_map( 'intval', $query['terms'] ) );
$terms = $wpdb->get_col( "
* @return mixed|null|WP_Error Term Row from database. Will return null if $term is empty. If taxonomy does not
* exist then WP_Error will be returned.
*/
-function &get_term($term, $taxonomy, $output = OBJECT, $filter = 'raw') {
+function get_term($term, $taxonomy, $output = OBJECT, $filter = 'raw') {
global $wpdb;
$null = null;
return false;
} else if ( 'name' == $field ) {
// Assume already escaped
- $value = stripslashes($value);
+ $value = wp_unslash($value);
$field = 't.name';
} else {
$term = get_term( (int) $value, $taxonomy, $output, $filter);
* @param string|array $args The values of what to search for when returning terms
* @return array|WP_Error List of Term Objects and their children. Will return WP_Error, if any of $taxonomies do not exist.
*/
-function &get_terms($taxonomies, $args = '') {
+function get_terms($taxonomies, $args = '') {
global $wpdb;
$empty_array = array();
- $single_taxonomy = false;
- if ( !is_array($taxonomies) ) {
- $single_taxonomy = true;
- $taxonomies = array($taxonomies);
- }
+ $single_taxonomy = ! is_array( $taxonomies ) || 1 === count( $taxonomies );
+ if ( ! is_array( $taxonomies ) )
+ $taxonomies = array( $taxonomies );
foreach ( $taxonomies as $taxonomy ) {
if ( ! taxonomy_exists($taxonomy) ) {
// $args can be whatever, only use the args defined in defaults to compute the key
$filter_key = ( has_filter('list_terms_exclusions') ) ? serialize($GLOBALS['wp_filter']['list_terms_exclusions']) : '';
$key = md5( serialize( compact(array_keys($defaults)) ) . serialize( $taxonomies ) . $filter_key );
- $last_changed = wp_cache_get('last_changed', 'terms');
- if ( !$last_changed ) {
- $last_changed = time();
- wp_cache_set('last_changed', $last_changed, 'terms');
+ $last_changed = wp_cache_get( 'last_changed', 'terms' );
+ if ( ! $last_changed ) {
+ $last_changed = microtime();
+ wp_cache_set( 'last_changed', $last_changed, 'terms' );
}
$cache_key = "get_terms:$key:$last_changed";
$cache = wp_cache_get( $cache_key, 'terms' );
$where .= ' AND tt.count > 0';
// don't limit the query results when we have to descend the family tree
- if ( ! empty($number) && ! $hierarchical && empty( $child_of ) && '' === $parent ) {
+ if ( $number && ! $hierarchical && ! $child_of && '' === $parent ) {
if ( $offset )
$limits = 'LIMIT ' . $offset . ',' . $number;
else
}
if ( empty($terms) ) {
- wp_cache_add( $cache_key, array(), 'terms', 86400 ); // one day
+ wp_cache_add( $cache_key, array(), 'terms', DAY_IN_SECONDS );
$terms = apply_filters('get_terms', array(), $taxonomies, $args);
return $terms;
}
if ( $child_of ) {
$children = _get_term_hierarchy($taxonomies[0]);
if ( ! empty($children) )
- $terms = & _get_term_children($child_of, $terms, $taxonomies[0]);
+ $terms = _get_term_children($child_of, $terms, $taxonomies[0]);
}
// Update term counts to include children.
$terms = $_terms;
}
- if ( 0 < $number && intval(@count($terms)) > $number ) {
- $terms = array_slice($terms, $offset, $number);
- }
+ if ( $number && is_array( $terms ) && count( $terms ) > $number )
+ $terms = array_slice( $terms, $offset, $number );
- wp_cache_add( $cache_key, $terms, 'terms', 86400 ); // one day
+ wp_cache_add( $cache_key, $terms, 'terms', DAY_IN_SECONDS );
$terms = apply_filters('get_terms', $terms, $taxonomies, $args);
return $terms;
return $wpdb->get_var( $wpdb->prepare( $select . $where, $term ) );
}
- $term = trim( stripslashes( $term ) );
+ $term = trim( wp_unslash( $term ) );
if ( '' === $slug = sanitize_title($term) )
return 0;
*
* @param string $taxonomy Taxonomy name
* @param array|string $args Overwrite defaults. See get_terms()
- * @return int How many terms are in $taxonomy
+ * @return int|WP_Error How many terms are in $taxonomy. WP_Error if $taxonomy does not exist.
*/
function wp_count_terms( $taxonomy, $args = array() ) {
$defaults = array('hide_empty' => false);
* @package WordPress
* @subpackage Taxonomy
* @since 2.3.0
- * @uses $wpdb
+ * @uses wp_remove_object_terms()
*
* @param int $object_id The term Object Id that refers to the term
* @param string|array $taxonomies List of Taxonomy Names or single Taxonomy name.
*/
function wp_delete_object_term_relationships( $object_id, $taxonomies ) {
- global $wpdb;
-
$object_id = (int) $object_id;
if ( !is_array($taxonomies) )
$taxonomies = array($taxonomies);
foreach ( (array) $taxonomies as $taxonomy ) {
- $tt_ids = wp_get_object_terms($object_id, $taxonomy, array('fields' => 'tt_ids'));
- $in_tt_ids = "'" . implode("', '", $tt_ids) . "'";
- do_action( 'delete_term_relationships', $object_id, $tt_ids );
- $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id IN ($in_tt_ids)", $object_id) );
- do_action( 'deleted_term_relationships', $object_id, $tt_ids );
- wp_update_term_count($tt_ids, $taxonomy);
+ $term_ids = wp_get_object_terms( $object_id, $taxonomy, array( 'fields' => 'ids' ) );
+ $term_ids = array_map( 'intval', $term_ids );
+ wp_remove_object_terms( $object_id, $term_ids, $taxonomy );
}
}
*
* @uses $wpdb
* @uses do_action() Calls both 'delete_term' and 'delete_$taxonomy' action
- * hooks, passing term object, term id. 'delete_term' gets an additional
- * parameter with the $taxonomy parameter.
+ * hooks, passing term ID, term taxonomy ID, and deleted term object. 'delete_term'
+ * also gets taxonomy as the third parameter.
*
* @param int $term Term ID
* @param string $taxonomy Taxonomy Name
foreach ( $tax_object->object_type as $object_type )
clean_object_term_cache( $objects, $object_type );
+ // Get the object before deletion so we can pass to actions below
+ $deleted_term = get_term( $term, $taxonomy );
+
do_action( 'delete_term_taxonomy', $tt_id );
$wpdb->delete( $wpdb->term_taxonomy, array( 'term_taxonomy_id' => $tt_id ) );
do_action( 'deleted_term_taxonomy', $tt_id );
clean_term_cache($term, $taxonomy);
- do_action('delete_term', $term, $tt_id, $taxonomy);
- do_action("delete_$taxonomy", $term, $tt_id);
+ do_action( 'delete_term', $term, $tt_id, $taxonomy, $deleted_term );
+ do_action( "delete_$taxonomy", $term, $tt_id, $deleted_term );
return true;
}
extract($args, EXTR_SKIP);
// expected_slashed ($name)
- $name = stripslashes($name);
- $description = stripslashes($description);
+ $name = wp_unslash($name);
+ $description = wp_unslash($description);
if ( empty($slug) )
$slug = sanitize_title($name);
* @package WordPress
* @subpackage Taxonomy
* @since 2.3.0
- * @uses $wpdb
+ * @uses wp_remove_object_terms()
*
* @param int $object_id The object to relate to.
* @param array|int|string $terms The slug or id of the term, will replace all existing
wp_update_term_count( $new_tt_ids, $taxonomy );
if ( ! $append ) {
- $delete_terms = array_diff($old_tt_ids, $tt_ids);
- if ( $delete_terms ) {
- $in_delete_terms = "'" . implode("', '", $delete_terms) . "'";
- do_action( 'delete_term_relationships', $object_id, $delete_terms );
- $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id IN ($in_delete_terms)", $object_id) );
- do_action( 'deleted_term_relationships', $object_id, $delete_terms );
- wp_update_term_count($delete_terms, $taxonomy);
+ $delete_tt_ids = array_diff( $old_tt_ids, $tt_ids );
+
+ if ( $delete_tt_ids ) {
+ $in_delete_tt_ids = "'" . implode( "', '", $delete_tt_ids ) . "'";
+ $delete_term_ids = $wpdb->get_col( $wpdb->prepare( "SELECT tt.term_id FROM $wpdb->term_taxonomy AS tt WHERE tt.taxonomy = %s AND tt.term_taxonomy_id IN ($in_delete_tt_ids)", $taxonomy ) );
+ $delete_term_ids = array_map( 'intval', $delete_term_ids );
+
+ $remove = wp_remove_object_terms( $object_id, $delete_term_ids, $taxonomy );
+ if ( is_wp_error( $remove ) ) {
+ return $remove;
+ }
}
}
if ( in_array($tt_id, $final_tt_ids) )
$values[] = $wpdb->prepare( "(%d, %d, %d)", $object_id, $tt_id, ++$term_order);
if ( $values )
- $wpdb->query("INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join(',', $values) . " ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)");
+ if ( false === $wpdb->query( "INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join( ',', $values ) . " ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)" ) )
+ return new WP_Error( 'db_insert_error', __( 'Could not insert term relationship into the database' ), $wpdb->last_error );
}
+ wp_cache_delete( $object_id, $taxonomy . '_relationships' );
+
do_action('set_object_terms', $object_id, $terms, $tt_ids, $taxonomy, $append, $old_tt_ids);
return $tt_ids;
}
+/**
+ * Add term(s) associated with a given object.
+ *
+ * @package WordPress
+ * @subpackage Taxonomy
+ * @since 3.6
+ * @uses wp_set_object_terms()
+ *
+ * @param int $object_id The ID of the object to which the terms will be added.
+ * @param array|int|string $terms The slug(s) or ID(s) of the term(s) to add.
+ * @param array|string $taxonomy Taxonomy name.
+ * @return array|WP_Error Affected Term IDs
+ */
+function wp_add_object_terms( $object_id, $terms, $taxonomy ) {
+ return wp_set_object_terms( $object_id, $terms, $taxonomy, true );
+}
+
+/**
+ * Remove term(s) associated with a given object.
+ *
+ * @package WordPress
+ * @subpackage Taxonomy
+ * @since 3.6
+ * @uses $wpdb
+ *
+ * @uses apply_filters() Calls 'delete_term_relationships' hook with object_id and tt_ids as parameters.
+ * @uses apply_filters() Calls 'deleted_term_relationships' hook with object_id and tt_ids as parameters.
+ *
+ * @param int $object_id The ID of the object from which the terms will be removed.
+ * @param array|int|string $terms The slug(s) or ID(s) of the term(s) to remove.
+ * @param array|string $taxonomy Taxonomy name.
+ * @return bool|WP_Error True on success, false or WP_Error on failure.
+ */
+function wp_remove_object_terms( $object_id, $terms, $taxonomy ) {
+ global $wpdb;
+
+ $object_id = (int) $object_id;
+
+ if ( ! taxonomy_exists( $taxonomy ) ) {
+ return new WP_Error( 'invalid_taxonomy', __( 'Invalid Taxonomy' ) );
+ }
+
+ if ( ! is_array( $terms ) ) {
+ $terms = array( $terms );
+ }
+
+ $tt_ids = array();
+
+ foreach ( (array) $terms as $term ) {
+ if ( ! strlen( trim( $term ) ) ) {
+ continue;
+ }
+
+ if ( ! $term_info = term_exists( $term, $taxonomy ) ) {
+ // Skip if a non-existent term ID is passed.
+ if ( is_int( $term ) ) {
+ continue;
+ }
+ }
+
+ if ( is_wp_error( $term_info ) ) {
+ return $term_info;
+ }
+
+ $tt_ids[] = $term_info['term_taxonomy_id'];
+ }
+
+ if ( $tt_ids ) {
+ $in_tt_ids = "'" . implode( "', '", $tt_ids ) . "'";
+ do_action( 'delete_term_relationships', $object_id, $tt_ids );
+ $deleted = $wpdb->query( $wpdb->prepare( "DELETE FROM $wpdb->term_relationships WHERE object_id = %d AND term_taxonomy_id IN ($in_tt_ids)", $object_id ) );
+ do_action( 'deleted_term_relationships', $object_id, $tt_ids );
+ wp_update_term_count( $tt_ids, $taxonomy );
+
+ return (bool) $deleted;
+ }
+
+ return false;
+}
+
/**
* Will make slug unique, if it isn't already.
*
return $term;
// Escape data pulled from DB.
- $term = add_magic_quotes($term);
+ $term = wp_slash($term);
// Merge old and new args with new args overwriting old ones.
$args = array_merge($term, $args);
extract($args, EXTR_SKIP);
// expected_slashed ($name)
- $name = stripslashes($name);
- $description = stripslashes($description);
+ $name = wp_unslash($name);
+ $description = wp_unslash($description);
if ( '' == trim($name) )
return new WP_Error('empty_term_name', __('A name is required for this term'));
if ( !is_array($object_ids) )
$object_ids = array($object_ids);
+ $taxonomies = get_object_taxonomies( $object_type );
+
foreach ( $object_ids as $id )
- foreach ( get_object_taxonomies($object_type) as $taxonomy )
+ foreach ( $taxonomies as $taxonomy )
wp_cache_delete($id, "{$taxonomy}_relationships");
do_action('clean_object_term_cache', $object_ids, $object_type);
do_action('clean_term_cache', $ids, $taxonomy);
}
- wp_cache_set('last_changed', time(), 'terms');
+ wp_cache_set( 'last_changed', microtime(), 'terms' );
}
/**
* @param string $taxonomy Taxonomy Name
* @return bool|array Empty array if $terms found, but not $taxonomy. False if nothing is in cache for $taxonomy and $id.
*/
-function &get_object_term_cache($id, $taxonomy) {
+function get_object_term_cache($id, $taxonomy) {
$cache = wp_cache_get($id, "{$taxonomy}_relationships");
return $cache;
}
* @param string $taxonomy The taxonomy which determines the hierarchy of the terms.
* @return array The subset of $terms that are descendants of $term_id.
*/
-function &_get_term_children($term_id, $terms, $taxonomy) {
+function _get_term_children($term_id, $terms, $taxonomy) {
$empty_array = array();
if ( empty($terms) )
return $empty_array;
if ( !is_object($term) ) {
if ( is_int($term) ) {
- $term = &get_term($term, $taxonomy);
+ $term = get_term($term, $taxonomy);
} else {
- $term = &get_term_by('slug', $term, $taxonomy);
+ $term = get_term_by('slug', $term, $taxonomy);
}
}
* @return array
*/
function get_the_taxonomies($post = 0, $args = array() ) {
- if ( is_int($post) )
- $post =& get_post($post);
- elseif ( !is_object($post) )
- $post =& $GLOBALS['post'];
+ $post = get_post( $post );
$args = wp_parse_args( $args, array(
'template' => '%s: %l.',
$t['template'] = $template;
$terms = get_object_term_cache($post->ID, $taxonomy);
- if ( empty($terms) )
+ if ( false === $terms )
$terms = wp_get_object_terms($post->ID, $taxonomy, $t['args']);
$links = array();
* @return array
*/
function get_post_taxonomies($post = 0) {
- $post =& get_post($post);
+ $post = get_post( $post );
return get_object_taxonomies($post);
}
return new WP_Error( 'invalid_object', __( 'Invalid object ID' ) );
$object_terms = get_object_term_cache( $object_id, $taxonomy );
- if ( empty( $object_terms ) )
+ if ( false === $object_terms )
$object_terms = wp_get_object_terms( $object_id, $taxonomy );
if ( is_wp_error( $object_terms ) )
$ancestors[] = (int) $term->parent;
$term = get_term($term->parent, $object_type);
}
- } elseif ( null !== get_post_type_object( $object_type ) ) {
- $object = get_post($object_id);
- if ( ! is_wp_error( $object ) && isset( $object->ancestors ) && is_array( $object->ancestors ) )
- $ancestors = $object->ancestors;
- else {
- while ( ! is_wp_error($object) && ! empty( $object->post_parent ) && ! in_array( $object->post_parent, $ancestors ) ) {
- $ancestors[] = (int) $object->post_parent;
- $object = get_post($object->post_parent);
- }
- }
+ } elseif ( post_type_exists( $object_type ) ) {
+ $ancestors = get_post_ancestors($object_id);
}
return apply_filters('get_ancestors', $ancestors, $object_id, $object_type);
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff