diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-08-13 15:13:05 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-08-13 15:13:05 +0000 |
| commit | bfa3b629e0d67016ec83050c5db762479af40609 (patch) | |
| tree | 4c9ae204172d0fad3ae056ccc65ffe9ea91134d2 /wp-includes/query.php | |
| parent | 7258ea2d7eeedb439607b72a1f74dee98e4b9d12 (diff) | |
| download | wordpress-mu-bfa3b629e0d67016ec83050c5db762479af40609.tar.gz wordpress-mu-bfa3b629e0d67016ec83050c5db762479af40609.tar.xz wordpress-mu-bfa3b629e0d67016ec83050c5db762479af40609.zip | |
Merge with WP revision 8635
git-svn-id: http://svn.automattic.com/wordpress-mu/branches/2.6@1421 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/query.php')
| -rw-r--r-- | wp-includes/query.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wp-includes/query.php b/wp-includes/query.php index 5f5cb3f..35e53f3 100644 --- a/wp-includes/query.php +++ b/wp-includes/query.php @@ -773,7 +773,7 @@ class WP_Query { $qv['post_type'] = sanitize_user($qv['post_type'], true);
if ( !empty($qv['post_status']) )
- $qv['post_status'] = sanitize_user($qv['post_status'], true);
+ $qv['post_status'] = preg_replace('|[^a-z0-9_,-]|', '', $qv['post_status']);
if ( $this->is_posts_page && !$qv['withcomments'] )
$this->is_comment_feed = false;
@@ -1123,9 +1123,9 @@ class WP_Query { $whichcat .= " AND $wpdb->term_taxonomy.taxonomy = 'post_tag' ";
$include_tags = "'" . implode("', '", $q['tag_slug__in']) . "'";
$whichcat .= " AND $wpdb->terms.slug IN ($include_tags) ";
- $reqtag = is_term( $q['tag_slug__in'][0], 'post_tag' );
+ $reqtag = get_term_by( 'slug', $q['tag_slug__in'][0], 'post_tag' );
if ( !empty($reqtag) )
- $q['tag_id'] = $reqtag['term_id'];
+ $q['tag_id'] = $reqtag->term_id;
}
if ( !empty($q['tag__not_in']) ) {
|