From 892be738b0485c6c9392a6fc90de6266e6576615 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Sat, 1 Nov 2014 22:33:21 +0000
Subject: [PATCH] Make the docs type for `return` in `wpmu_create_user()` more
 specific.

See #30224.

Built from https://develop.svn.wordpress.org/trunk@30165


git-svn-id: http://core.svn.wordpress.org/trunk@30165 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/ms-functions.php | 2 +-
 wp-includes/version.php      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index 18862005b4..df65938923 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -1063,7 +1063,7 @@ function wpmu_activate_signup($key) {
  * @param string $user_name The new user's login name.
  * @param string $password The new user's password.
  * @param string $email The new user's email address.
- * @return mixed Returns false on failure, or int $user_id on success
+ * @return int|bool Returns false on failure, or int $user_id on success
  */
 function wpmu_create_user( $user_name, $password, $email ) {
 	$user_name = preg_replace( '/\s+/', '', sanitize_user( $user_name, true ) );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 2f3ebc9711..b31f3d3429 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-alpha-30164';
+$wp_version = '4.1-alpha-30165';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.