Changeset 15734

Timestamp:

10/06/2010 12:06:23 PM (9 years ago)

Author:

scribu

Message:

Prevent db error when dealing with unexistant parent term. See #12891

Location:

trunk/wp-includes

Files:

• classes.php (modified) (1 diff)
• taxonomy.php (modified) (4 diffs)

trunk/wp-includes/classes.php

@@ -697 +697 @@
             if ( !isset( $query['include_children'] ) )
                 $query['include_children'] = true;
+
             $query['do_query'] = false;
-            $sql[] = get_objects_in_term( $query['terms'], $query['taxonomy'], $query );
+            
+            $sql_single = get_objects_in_term( $query['terms'], $query['taxonomy'], $query );
+
+            if ( empty( $sql_single ) )
+                return ' AND 0 = 1';
+
+            $sql[] = $sql_single;
         }
 

trunk/wp-includes/taxonomy.php

@@ -467 +467 @@
     }
 
-    $terms = array_unique( (array) $terms );
-    if ( empty($terms) )
-        continue;
-
     if ( !in_array( $field, array( 'term_id', 'slug', 'name' ) ) )
         $field = 'term_id';
@@ -476 +472 @@
     if ( !in_array( $operator, array( 'IN', 'NOT IN' ) ) )
         $operator = 'IN';
+
+    $terms = array_unique( (array) $terms );
 
     if ( is_taxonomy_hierarchical( $taxonomy ) && $include_children ) {
@@ -493 +491 @@
     }
 
+    if ( empty( $terms ) )
+        return $do_query ? array() : '';
+
     $taxonomies = "'" . implode( "', '", $taxonomies ) . "'";
 
@@ -528 +529 @@
     }
 
-    if ( !$do_query )
-        return $sql;
-
-    return $wpdb->get_col( $sql );  
+    return $do_query ? $wpdb->get_col( $sql ) : $sql;
 }