WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add terms_clauses filter. Props sc0ttkclark for initial patch. See #15020 

git-svn-id: http://svn.automattic.com/wordpress/trunk@16056 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
scribu 2010-10-28 17:55:30 +00:00
parent d4ef5a4029
commit bc5d96f856
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
wp-includes/taxonomy.php
View File

@ -918,8 +918,6 @@ function &get_terms($taxonomies, $args = '') {
} }
} }
$in_taxonomies = "'" . implode("', '", $taxonomies) . "'";
$defaults = array('orderby' => 'name', 'order' => 'ASC', $defaults = array('orderby' => 'name', 'order' => 'ASC',
'hide_empty' => true, 'exclude' => array(), 'exclude_tree' => array(), 'include' => array(), 'hide_empty' => true, 'exclude' => array(), 'exclude_tree' => array(), 'include' => array(),
'number' => '', 'fields' => 'all', 'slug' => '', 'parent' => '', 'number' => '', 'fields' => 'all', 'slug' => '', 'parent' => '',
@ -941,6 +939,7 @@ function &get_terms($taxonomies, $args = '') {
$args['hierarchical'] = false; $args['hierarchical'] = false;
$args['pad_counts'] = false; $args['pad_counts'] = false;
} }
extract($args, EXTR_SKIP); extract($args, EXTR_SKIP);
if ( $child_of ) { if ( $child_of ) {
@ -991,7 +990,7 @@ function &get_terms($taxonomies, $args = '') {
else else
$order = ''; $order = '';
$where = ''; $where = "tt.taxonomy IN ('" . implode("', '", $taxonomies) . "')";
$inclusions = ''; $inclusions = '';
if ( !empty($include) ) { if ( !empty($include) ) {
$exclude = ''; $exclude = '';
@ -1058,11 +1057,11 @@ function &get_terms($taxonomies, $args = '') {
// don't limit the query results when we have to descend the family tree // don't limit the query results when we have to descend the family tree
if ( ! empty($number) && ! $hierarchical && empty( $child_of ) && '' === $parent ) { if ( ! empty($number) && ! $hierarchical && empty( $child_of ) && '' === $parent ) {
if ( $offset ) if ( $offset )
$limit = 'LIMIT ' . $offset . ',' . $number; $limits = 'LIMIT ' . $offset . ',' . $number;
else else
$limit = 'LIMIT ' . $number; $limits = 'LIMIT ' . $number;
} else { } else {
$limit = ''; $limits = '';
} }
if ( !empty($search) ) { if ( !empty($search) ) {
@ -1087,9 +1086,21 @@ function &get_terms($taxonomies, $args = '') {
$order = ''; $order = '';
$selects = array('COUNT(*)'); $selects = array('COUNT(*)');
} }
$select_this = implode(', ', apply_filters( 'get_terms_fields', $selects, $args ));
$query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE tt.taxonomy IN ($in_taxonomies) $where $orderby $order $limit"; $_fields = $fields;
$fields = implode(', ', apply_filters( 'get_terms_fields', $selects, $args ));
$join = "INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id";
$pieces = array( 'fields', 'join', 'where', 'orderby', 'order', 'limits' );
$clauses = apply_filters( 'terms_clauses', compact( $pieces ), $taxonomies, $args );
foreach ( $pieces as $piece )
$$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
$query = "SELECT $fields FROM $wpdb->terms AS t $join WHERE $where $orderby $order $limits";
$fields = $_fields;
if ( 'count' == $fields ) { if ( 'count' == $fields ) {
$term_count = $wpdb->get_var($query); $term_count = $wpdb->get_var($query);