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

Revert [28613] and [28664]. A good idea, but too much BC baggage. 

See #28099.


Built from https://develop.svn.wordpress.org/trunk@28783


git-svn-id: http://core.svn.wordpress.org/trunk@28596 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2014-06-20 16:21:17 +00:00
parent 6782686192
commit 22e5b6932a
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
wp-includes/query.php
View File

@ -1830,8 +1830,6 @@ class WP_Query {
'field' => 'term_id', 'field' => 'term_id',
'include_children' => false 'include_children' => false
); );
} elseif ( isset( $this->query['category__in'] ) ) {
$q['category__in'] = false;
} }
if ( ! empty($q['category__not_in']) ) { if ( ! empty($q['category__not_in']) ) {
@ -1889,8 +1887,6 @@ class WP_Query {
'taxonomy' => 'post_tag', 'taxonomy' => 'post_tag',
'terms' => $q['tag__in'] 'terms' => $q['tag__in']
); );
} elseif ( isset( $this->query['tag__in'] ) ) {
$q['tag__in'] = false;
} }
if ( !empty($q['tag__not_in']) ) { if ( !empty($q['tag__not_in']) ) {
@ -1918,8 +1914,6 @@ class WP_Query {
'terms' => $q['tag_slug__in'], 'terms' => $q['tag_slug__in'],
'field' => 'slug' 'field' => 'slug'
); );
} elseif ( isset( $this->query['tag_slug__in'] ) ) {
$q['tag_slug__in'] = false;
} }
if ( !empty($q['tag_slug__and']) ) { if ( !empty($q['tag_slug__and']) ) {
@ -2453,9 +2447,6 @@ class WP_Query {
} elseif ( $q['post__in'] ) { } elseif ( $q['post__in'] ) {
$post__in = implode(',', array_map( 'absint', $q['post__in'] )); $post__in = implode(',', array_map( 'absint', $q['post__in'] ));
$where .= " AND {$wpdb->posts}.ID IN ($post__in)"; $where .= " AND {$wpdb->posts}.ID IN ($post__in)";
} elseif ( isset( $this->query['post__in'] ) ) {
$post__in = 0;
$where .= " AND 1=0 ";
} elseif ( $q['post__not_in'] ) { } elseif ( $q['post__not_in'] ) {
$post__not_in = implode(',', array_map( 'absint', $q['post__not_in'] )); $post__not_in = implode(',', array_map( 'absint', $q['post__not_in'] ));
$where .= " AND {$wpdb->posts}.ID NOT IN ($post__not_in)"; $where .= " AND {$wpdb->posts}.ID NOT IN ($post__not_in)";
@ -2466,9 +2457,6 @@ class WP_Query {
} elseif ( $q['post_parent__in'] ) { } elseif ( $q['post_parent__in'] ) {
$post_parent__in = implode( ',', array_map( 'absint', $q['post_parent__in'] ) ); $post_parent__in = implode( ',', array_map( 'absint', $q['post_parent__in'] ) );
$where .= " AND {$wpdb->posts}.post_parent IN ($post_parent__in)"; $where .= " AND {$wpdb->posts}.post_parent IN ($post_parent__in)";
} elseif ( isset( $this->query['post_parent__in'] ) ) {
$post_parent__in = 0;
$where .= " AND 1=0 ";
} elseif ( $q['post_parent__not_in'] ) { } elseif ( $q['post_parent__not_in'] ) {
$post_parent__not_in = implode( ',', array_map( 'absint', $q['post_parent__not_in'] ) ); $post_parent__not_in = implode( ',', array_map( 'absint', $q['post_parent__not_in'] ) );
$where .= " AND {$wpdb->posts}.post_parent NOT IN ($post_parent__not_in)"; $where .= " AND {$wpdb->posts}.post_parent NOT IN ($post_parent__not_in)";
@ -2508,13 +2496,6 @@ class WP_Query {
$where .= $clauses['where']; $where .= $clauses['where'];
} }
// If *__in is passed to WP_Query as an empty array, don't return results
foreach ( array( 'category', 'tag', 'tag_slug' ) as $in ) {
if ( isset( $q["{$in}__in"] ) && false === $q["{$in}__in"] ) {
$where = " AND 1=0 $where";
}
}
if ( $this->is_tax ) { if ( $this->is_tax ) {
if ( empty($post_type) ) { if ( empty($post_type) ) {
// Do a fully inclusive search for currently registered post types of queried taxonomies // Do a fully inclusive search for currently registered post types of queried taxonomies
@ -2606,9 +2587,6 @@ class WP_Query {
} elseif ( ! empty( $q['author__in'] ) ) { } elseif ( ! empty( $q['author__in'] ) ) {
$author__in = implode( ',', array_map( 'absint', array_unique( (array) $q['author__in'] ) ) ); $author__in = implode( ',', array_map( 'absint', array_unique( (array) $q['author__in'] ) ) );
$where .= " AND {$wpdb->posts}.post_author IN ($author__in) "; $where .= " AND {$wpdb->posts}.post_author IN ($author__in) ";
} elseif ( isset( $this->query['author__in'] ) ) {
$author__in = 0;
$where .= ' AND 1=0 ';
} }
// Author stuff for nice URLs // Author stuff for nice URLs

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.0-alpha-20140619'; $wp_version = '4.0-alpha-20140620';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.