Changes from branches/4.4/src/wp-includes/taxonomy.php at r36358 to trunk/src/wp-includes/taxonomy.php at r35725
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-includes/taxonomy.php
r36358 r35725 391 391 $args['query_var'] = sanitize_title_with_dashes( $args['query_var'] ); 392 392 $wp->add_query_var( $args['query_var'] ); 393 } else {394 // Force query_var to false for non-public taxonomies.395 $args['query_var'] = false;396 393 } 397 394 … … 1357 1354 // Meta query support. 1358 1355 $join = ''; 1359 $distinct = '';1360 1356 if ( ! empty( $args['meta_query'] ) ) { 1361 1357 $mquery = new WP_Meta_Query( $args['meta_query'] ); … … 1364 1360 $join .= $mq_sql['join']; 1365 1361 $where .= $mq_sql['where']; 1366 $distinct .= "DISTINCT";1367 1362 } 1368 1363 … … 1414 1409 $join .= " INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id"; 1415 1410 1416 $pieces = array( 'fields', 'join', 'where', ' distinct', 'orderby', 'order', 'limits' );1411 $pieces = array( 'fields', 'join', 'where', 'orderby', 'order', 'limits' ); 1417 1412 1418 1413 /** … … 1430 1425 $join = isset( $clauses[ 'join' ] ) ? $clauses[ 'join' ] : ''; 1431 1426 $where = isset( $clauses[ 'where' ] ) ? $clauses[ 'where' ] : ''; 1432 $distinct = isset( $clauses[ 'distinct' ] ) ? $clauses[ 'distinct' ] : '';1433 1427 $orderby = isset( $clauses[ 'orderby' ] ) ? $clauses[ 'orderby' ] : ''; 1434 1428 $order = isset( $clauses[ 'order' ] ) ? $clauses[ 'order' ] : ''; 1435 1429 $limits = isset( $clauses[ 'limits' ] ) ? $clauses[ 'limits' ] : ''; 1436 1430 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"; 1438 1432 1439 1433 // $args can be anything. Only use the args defined in defaults to compute the key. … … 3611 3605 $terms = wp_get_object_terms( $ids, $taxonomies, array( 3612 3606 'fields' => 'all_with_object_id', 3613 'orderby' => 'n ame',3607 'orderby' => 'none', 3614 3608 'update_term_meta_cache' => false, 3615 3609 ) ); … … 3647 3641 foreach ( (array) $terms as $term ) { 3648 3642 // Create a copy in case the array was passed by reference. 3649 $_term = clone$term;3643 $_term = $term; 3650 3644 3651 3645 // Object ID should not be cached.
Note: See TracChangeset
for help on using the changeset viewer.