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

Fix parent=0 queries. Props Denis-de-Bernardy 107 minutes ago. . fixes #9960 

git-svn-id: http://svn.automattic.com/wordpress/trunk@11476 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2009-05-28 18:06:08 +00:00
parent f6a809c4af
commit f50600bc13
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/taxonomy.php
View File

@ -630,7 +630,7 @@ function &get_terms($taxonomies, $args = '') {
$args['number'] = absint( $args['number'] ); $args['number'] = absint( $args['number'] );
$args['offset'] = absint( $args['offset'] ); $args['offset'] = absint( $args['offset'] );
if ( !$single_taxonomy || !is_taxonomy_hierarchical($taxonomies[0]) || if ( !$single_taxonomy || !is_taxonomy_hierarchical($taxonomies[0]) ||
'' != $args['parent'] ) { '' !== $args['parent'] ) {
$args['child_of'] = 0; $args['child_of'] = 0;
$args['hierarchical'] = false; $args['hierarchical'] = false;
$args['pad_counts'] = false; $args['pad_counts'] = false;
@ -745,7 +745,7 @@ function &get_terms($taxonomies, $args = '') {
if ( !empty($name__like) ) if ( !empty($name__like) )
$where .= " AND t.name LIKE '{$name__like}%'"; $where .= " AND t.name LIKE '{$name__like}%'";
if ( '' != $parent ) { if ( '' !== $parent ) {
$parent = (int) $parent; $parent = (int) $parent;
$where .= " AND tt.parent = '$parent'"; $where .= " AND tt.parent = '$parent'";
} }
@ -754,7 +754,7 @@ function &get_terms($taxonomies, $args = '') {
$where .= ' AND tt.count > 0'; $where .= ' AND tt.count > 0';
// 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; $limit = 'LIMIT ' . $offset . ',' . $number;
else else