WordPress.org

Make WordPress Core


Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/taxonomy.php

    r36109 r35725  
    391391            $args['query_var'] = sanitize_title_with_dashes( $args['query_var'] );
    392392        $wp->add_query_var( $args['query_var'] );
    393     } else {
    394         // Force query_var to false for non-public taxonomies.
    395         $args['query_var'] = false;
    396393    }
    397394
     
    13571354    // Meta query support.
    13581355    $join = '';
    1359     $distinct = '';
    13601356    if ( ! empty( $args['meta_query'] ) ) {
    13611357        $mquery = new WP_Meta_Query( $args['meta_query'] );
     
    13641360        $join  .= $mq_sql['join'];
    13651361        $where .= $mq_sql['where'];
    1366         $distinct .= "DISTINCT";
    13671362    }
    13681363
     
    14141409    $join .= " INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id";
    14151410
    1416     $pieces = array( 'fields', 'join', 'where', 'distinct', 'orderby', 'order', 'limits' );
     1411    $pieces = array( 'fields', 'join', 'where', 'orderby', 'order', 'limits' );
    14171412
    14181413    /**
     
    14301425    $join = isset( $clauses[ 'join' ] ) ? $clauses[ 'join' ] : '';
    14311426    $where = isset( $clauses[ 'where' ] ) ? $clauses[ 'where' ] : '';
    1432     $distinct = isset( $clauses[ 'distinct' ] ) ? $clauses[ 'distinct' ] : '';
    14331427    $orderby = isset( $clauses[ 'orderby' ] ) ? $clauses[ 'orderby' ] : '';
    14341428    $order = isset( $clauses[ 'order' ] ) ? $clauses[ 'order' ] : '';
    14351429    $limits = isset( $clauses[ 'limits' ] ) ? $clauses[ 'limits' ] : '';
    14361430
    1437     $query = "SELECT $distinct $fields FROM $wpdb->terms AS t $join WHERE $where $orderby $order $limits";
     1431    $query = "SELECT $fields FROM $wpdb->terms AS t $join WHERE $where $orderby $order $limits";
    14381432
    14391433    // $args can be anything. Only use the args defined in defaults to compute the key.
     
    36113605    $terms = wp_get_object_terms( $ids, $taxonomies, array(
    36123606        'fields' => 'all_with_object_id',
    3613         'orderby' => 'name',
     3607        'orderby' => 'none',
    36143608        'update_term_meta_cache' => false,
    36153609    ) );
Note: See TracChangeset for help on using the changeset viewer.