From 6552004a1a70d93fe8126ff2ee2c6c15051d0158 Mon Sep 17 00:00:00 2001
From: scribu <scribu@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 13 Dec 2010 11:44:53 +0000
Subject: [PATCH] Slight logic tweak to [16889]. See #14123

git-svn-id: http://svn.automattic.com/wordpress/trunk@16890 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/user.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-includes/user.php b/wp-includes/user.php
index c8089447c2..38a4a63370 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -469,7 +469,7 @@ class WP_User_Query {
 		$role = trim( $qv['role'] );
 		$blog_id = absint( $qv['blog_id'] );
 
-		if ( $role || ( is_multisite() && $blog_id ) ) {
+		if ( $blog_id && ( $role || is_multisite() ) ) {
 			$cap_meta_query = array();
 			$cap_meta_query['key'] = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities';