Changeset 25257 for trunk/src/wp-includes/taxonomy.php

Timestamp:

09/05/2013 05:14:54 PM (13 years ago)

Author:

wonderboymusic

Message:

Avoid database error when include or exclude is not really a term_id. Adds more unit tests.

Props kovshenin.
Fixes #11823.

File:

• trunk/src/wp-includes/taxonomy.php (modified) (2 diffs)

trunk/src/wp-includes/taxonomy.php

@@ -1311 +1311 @@
         }
 
-        if ( ! empty( $inclusions ) )
+        if ( ! empty( $inclusions ) ) {
                 $inclusions = ' AND t.term_id IN ( ' . $inclusions . ' )';
-        $where .= $inclusions;
+                $where .= $inclusions;
+        }
 
         $exclusions = '';
@@ -1340 +1341 @@
 
         $exclusions = apply_filters( 'list_terms_exclusions', $exclusions, $args );
-        $where .= $exclusions;
+
+        if ( ! empty( $exclusions ) )
+                $where .= $exclusions;
 
         if ( !empty($slug) ) {