Changeset 39955

Timestamp:

01/26/2017 01:39:03 PM (10 years ago)

Author:

ocean90

Message:

Query: Ensure that queries work correctly with post type names with special characters.

Merge of [39952] to the 4.6 branch.

File:

• branches/4.6/src/wp-includes/query.php (modified) (1 diff)

branches/4.6/src/wp-includes/query.php

@@ -3070 +3070 @@
                 if ( 'any' == $post_type ) {
                         $in_search_post_types = get_post_types( array('exclude_from_search' => false) );
-                        if ( empty( $in_search_post_types ) )
+                        if ( empty( $in_search_post_types ) ) {
                                 $where .= ' AND 1=0 ';
-                        else
-                                $where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $in_search_post_types ) . "')";
+                        } else {
+                                $where .= " AND {$wpdb->posts}.post_type IN ('" . join( "', '", array_map( 'esc_sql', $in_search_post_types ) ) . "')";
+                        }
                 } elseif ( !empty( $post_type ) && is_array( $post_type ) ) {
-                        $where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $post_type) . "')";
+                        $where .= " AND {$wpdb->posts}.post_type IN ('" . join("', '", esc_sql( $post_type ) ) . "')";
                 } elseif ( ! empty( $post_type ) ) {
-                        $where .= " AND $wpdb->posts.post_type = '$post_type'";
+                        $where .= $wpdb->prepare( " AND {$wpdb->posts}.post_type = %s", $post_type );
                         $post_type_object = get_post_type_object ( $post_type );
                 } elseif ( $this->is_attachment ) {