WP Merge to rev 3870

Added multi-blog stuff back into xmlrpc.php


git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@882 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 3 insertions, 3 deletions

diff --git a/wp-includes/query.php b/wp-includes/query.php
index 04a07df..01a28a9 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -794,16 +794,16 @@ class WP_Query {
 			$in_cats = substr($in_cats, 0, -2);

 			$out_cats = substr($out_cats, 0, -2);

 			if ( strlen($in_cats) > 0 )

-				$in_cats = " AND category_id IN ($in_cats)";

+				$in_cats = " AND $wpdb->post2cat.category_id IN ($in_cats)";

 			if ( strlen($out_cats) > 0 ) {

-				$ids = $wpdb->get_col("SELECT post_id FROM $wpdb->post2cat WHERE category_id IN ($out_cats)");

+				$ids = $wpdb->get_col("SELECT post_id FROM $wpdb->post2cat WHERE $wpdb->post2cat.category_id IN ($out_cats)");

 				if ( is_array($ids) && count($ids > 0) ) {

 					foreach ( $ids as $id )

 						$out_posts .= "$id, ";

 					$out_posts = substr($out_posts, 0, -2);

 				}

 				if ( strlen($out_posts) > 0 )

-					$out_cats = " AND ID NOT IN ($out_posts)";

+					$out_cats = " AND $wpdb->posts.ID NOT IN ($out_posts)";

 				else

 					$out_cats = '';

 			}