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

Timestamp:

02/20/2016 08:03:31 PM (11 years ago)

Author:

boonebgorges

Message:

In get_terms(), assemble WHERE conditions in an array instead of concatenating.

This method is more reliable when adding new WHERE conditions.

See #35495.

File:

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

trunk/src/wp-includes/taxonomy.php

@@ -1310 +1310 @@
         }
 
-        $where = "tt.taxonomy IN ('" . implode("', '", $taxonomies) . "')";
+        $where_conditions = array();
+
+        $where_conditions[] = "tt.taxonomy IN ('" . implode("', '", $taxonomies) . "')";
 
         $exclude = $args['exclude'];
@@ -1324 +1326 @@
 
         if ( ! empty( $inclusions ) ) {
-                $inclusions = ' AND t.term_id IN ( ' . $inclusions . ' )';
-                $where .= $inclusions;
+                $where_conditions[] = 't.term_id IN ( ' . $inclusions . ' )';
         }
 
@@ -1355 +1356 @@
 
         if ( ! empty( $exclusions ) ) {
-                $exclusions = ' AND t.term_id NOT IN (' . implode( ',', array_map( 'intval', $exclusions ) ) . ')';
+                $exclusions = 't.term_id NOT IN (' . implode( ',', array_map( 'intval', $exclusions ) ) . ')';
         } else {
                 $exclusions = '';
@@ -1372 +1373 @@
 
         if ( ! empty( $exclusions ) ) {
-                $where .= $exclusions;
+                // Must do string manipulation here for backward compatibility with filter.
+                $where_conditions[] = preg_replace( '/^\s*AND\s*/', '', $exclusions );
         }
 
@@ -1382 +1384 @@
                 }
 
-                $where .= " AND t.name IN ('" . implode( "', '", array_map( 'esc_sql', $names ) ) . "')";
+                $where_conditions[] = "t.name IN ('" . implode( "', '", array_map( 'esc_sql', $names ) ) . "')";
         }
 
@@ -1388 +1390 @@
                 if ( is_array( $args['slug'] ) ) {
                         $slug = array_map( 'sanitize_title', $args['slug'] );
-                        $where .= " AND t.slug IN ('" . implode( "', '", $slug ) . "')";
+                        $where_conditions[] = "t.slug IN ('" . implode( "', '", $slug ) . "')";
                 } else {
                         $slug = sanitize_title( $args['slug'] );
-                        $where .= " AND t.slug = '$slug'";
+                        $where_conditions[] = "t.slug = '$slug'";
                 }
         }
 
         if ( ! empty( $args['name__like'] ) ) {
-                $where .= $wpdb->prepare( " AND t.name LIKE %s", '%' . $wpdb->esc_like( $args['name__like'] ) . '%' );
+                $where_conditions[] = $wpdb->prepare( "t.name LIKE %s", '%' . $wpdb->esc_like( $args['name__like'] ) . '%' );
         }
 
         if ( ! empty( $args['description__like'] ) ) {
-                $where .= $wpdb->prepare( " AND tt.description LIKE %s", '%' . $wpdb->esc_like( $args['description__like'] ) . '%' );
+                $where_conditions[] = $wpdb->prepare( "tt.description LIKE %s", '%' . $wpdb->esc_like( $args['description__like'] ) . '%' );
         }
 
         if ( '' !== $parent ) {
                 $parent = (int) $parent;
-                $where .= " AND tt.parent = '$parent'";
+                $where_conditions[] = "tt.parent = '$parent'";
         }
 
@@ -1413 +1415 @@
         }
         if ( $args['hide_empty'] && !$hierarchical ) {
-                $where .= ' AND tt.count > 0';
+                $where_conditions[] = 'tt.count > 0';
         }
 
@@ -1432 +1434 @@
         if ( ! empty( $args['search'] ) ) {
                 $like = '%' . $wpdb->esc_like( $args['search'] ) . '%';
-                $where .= $wpdb->prepare( ' AND ((t.name LIKE %s) OR (t.slug LIKE %s))', $like, $like );
+                $where_conditions[] = $wpdb->prepare( '((t.name LIKE %s) OR (t.slug LIKE %s))', $like, $like );
         }
 
@@ -1445 +1447 @@
 
         if ( ! empty( $meta_clauses ) ) {
-                $join  .= $mq_sql['join'];
-                $where .= $mq_sql['where'];
+                $join .= $mq_sql['join'];
+                $where_conditions[] = preg_replace( '/^\s*AND\s*/', '', $mq_sql['where'] );
                 $distinct .= "DISTINCT";
 
@@ -1534 +1536 @@
         $join .= " INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id";
 
+        $where = implode( ' AND ', $where_conditions );
+
         $pieces = array( 'fields', 'join', 'where', 'distinct', 'orderby', 'order', 'limits' );
 
@@ -1555 +1559 @@
         $limits = isset( $clauses[ 'limits' ] ) ? $clauses[ 'limits' ] : '';
 
-        $query = "SELECT $distinct $fields FROM $wpdb->terms AS t $join WHERE $where $orderby $order $limits";
+        if ( $where ) {
+                $where = "WHERE $where";
+        }
+
+        $query = "SELECT $distinct $fields FROM $wpdb->terms AS t $join $where $orderby $order $limits";
 
         // $args can be anything. Only use the args defined in defaults to compute the key.