diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php index 21c4468a54..840c4b436e 100644 --- a/wp-admin/includes/ms.php +++ b/wp-admin/includes/ms.php @@ -695,23 +695,3 @@ var tb_pathToImage = "../../wp-includes/js/thickbox/loadingAnimation.gif"; 10000, 'users', $count ); - } - - $count = get_blog_count(); - return apply_filters( 'wp_is_large_network', $count > 10000, 'sites', $count ); -} diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index 339b87eb2d..5787f10d05 100644 --- a/wp-includes/ms-functions.php +++ b/wp-includes/ms-functions.php @@ -1977,4 +1977,24 @@ function upload_size_limit_filter( $size ) { return min( $size, $fileupload_maxk ); return min( $size, $fileupload_maxk, get_upload_space_available() ); -} \ No newline at end of file +} + +/** + * Whether or not we have a large network. + * + * The default criteria for a large network is either more than 10,000 users or more than 10,000 sites. + * Plugins can alter this criteria using the 'wp_is_large_network' filter. + * + * @since 3.3.0 + * @param string $using 'sites or 'users'. Default is 'sites'. + * @return bool True if the network meets the criteria for large. False otherwise. + */ +function wp_is_large_network( $using = 'sites' ) { + if ( 'users' == $using ) { + $count = get_user_count(); + return apply_filters( 'wp_is_large_network', $count > 10000, 'users', $count ); + } + + $count = get_blog_count(); + return apply_filters( 'wp_is_large_network', $count > 10000, 'sites', $count ); +} diff --git a/wp-includes/user.php b/wp-includes/user.php index 68e6127e05..8f6fa9408e 100644 --- a/wp-includes/user.php +++ b/wp-includes/user.php @@ -474,7 +474,7 @@ class WP_User_Query { $search_columns = array('user_email'); elseif ( is_numeric($search) ) $search_columns = array('user_login', 'ID'); - elseif ( preg_match('|^https?://|', $search) && ! wp_is_large_network( 'users' ) ) + elseif ( preg_match('|^https?://|', $search) && ! ( is_multisite() && wp_is_large_network( 'users' ) ) ) $search_columns = array('user_url'); else $search_columns = array('user_login', 'user_nicename');