sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add 'orderby=description' support to get_terms().

Browse Source 
This fixes an interface inconsistency in edit-tags.php, where Description
appears as a sortable column header.

Props neil_pie.
Fixes #31364.

git-svn-id: https://develop.svn.wordpress.org/trunk@31532 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Boone Gorges 2015-02-24 16:36:26 +00:00
parent 4d61c79ca1
commit e365b3a364
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/wp-includes/taxonomy.php
View File

@ -1574,11 +1574,11 @@ function get_term_to_edit( $id, $taxonomy ) {
* @param array|string $args { * @param array|string $args {
* Optional. Array or string of arguments to get terms. * Optional. Array or string of arguments to get terms.
* *
* @type string $orderby Field(s) to order terms by. Accepts term fields ('name', 'slug', * @type string $orderby Field(s) to order terms by. Accepts term fields ('name', 'slug',
* 'term_group', 'term_id', 'id'), 'count' for term taxonomy count, * 'term_group', 'term_id', 'id', 'description'), 'count' for term
* 'include' to match the 'order' of the $include param, or 'none' * taxonomy count, 'include' to match the 'order' of the $include param,
* to skip ORDER BY. Defaults to 'name'. * or 'none' to skip ORDER BY. Defaults to 'name'.
* @type string $order Whether to order terms in ascending or descending order. * @type string $order Whether to order terms in ascending or descending order.
* Accepts 'ASC' (ascending) or 'DESC' (descending). * Accepts 'ASC' (ascending) or 'DESC' (descending).
* Default 'ASC'. * Default 'ASC'.
* @type bool|int $hide_empty Whether to hide terms not assigned to any posts. Accepts * @type bool|int $hide_empty Whether to hide terms not assigned to any posts. Accepts
@ -1747,6 +1747,8 @@ function get_terms( $taxonomies, $args = '' ) {
$orderby = "FIELD( t.term_id, $include )"; $orderby = "FIELD( t.term_id, $include )";
} elseif ( 'term_group' == $_orderby ) { } elseif ( 'term_group' == $_orderby ) {
$orderby = 't.term_group'; $orderby = 't.term_group';
} elseif ( 'description' == $_orderby ) {
$orderby = 'tt.description';
} elseif ( 'none' == $_orderby ) { } elseif ( 'none' == $_orderby ) {
$orderby = ''; $orderby = '';
} elseif ( empty($_orderby) || 'id' == $_orderby ) { } elseif ( empty($_orderby) || 'id' == $_orderby ) {

23
tests/phpunit/tests/term/getTerms.php
View File

@ -1135,6 +1135,29 @@ class Tests_Term_getTerms extends WP_UnitTestCase {
$this->assertEquals( array( $t4, $t1, $t2 ), $found ); $this->assertEquals( array( $t4, $t1, $t2 ), $found );
} }
/**
* @ticket 31364
*/
public function test_orderby_description() {
$tax = 'wptests_tax';
register_taxonomy( $tax, 'post' );
$t1 = $this->factory->term->create( array( 'taxonomy' => $tax, 'description' => 'fff' ) );
$t2 = $this->factory->term->create( array( 'taxonomy' => $tax, 'description' => 'aaa' ) );
$t3 = $this->factory->term->create( array( 'taxonomy' => $tax, 'description' => 'zzz' ) );
$t4 = $this->factory->term->create( array( 'taxonomy' => $tax, 'description' => 'jjj' ) );
$found = get_terms( $tax, array(
'fields' => 'ids',
'orderby' => 'description',
'hide_empty' => false,
) );
_unregister_taxonomy( 'wptests_tax' );
$this->assertEquals( array( $t2, $t1, $t4, $t3 ), $found );
}
public function test_hierarchical_false_with_parent() { public function test_hierarchical_false_with_parent() {
$initial_terms = $this->create_hierarchical_terms(); $initial_terms = $this->create_hierarchical_terms();