From 223dfd3468c8ede1b2bc15c643af0fd6cc0d63d8 Mon Sep 17 00:00:00 2001
From: scribu <scribu@git.wordpress.org>
Date: Mon, 13 Dec 2010 11:44:53 +0000
Subject: [PATCH] Slight logic tweak to [16889]. See #14123

git-svn-id: https://develop.svn.wordpress.org/trunk@16890 602fd350-edb4-49c9-b593-d223f7449a82
---
 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';