diff --git a/wp-includes/ms-deprecated.php b/wp-includes/ms-deprecated.php index b3d56077d8..5ef393b275 100644 --- a/wp-includes/ms-deprecated.php +++ b/wp-includes/ms-deprecated.php @@ -356,3 +356,39 @@ function get_blogaddress_by_domain( $domain, $path ) { } return esc_url_raw( $url ); } + +/** + * Create an empty blog. + * + * @since MU 1.0 + * @deprecated 4.4.0 + * + * @param string $domain The new blog's domain. + * @param string $path The new blog's path. + * @param string $weblog_title The new blog's title. + * @param int $site_id Optional. Defaults to 1. + * @return string|int The ID of the newly created blog + */ +function create_empty_blog( $domain, $path, $weblog_title, $site_id = 1 ) { + _deprecated_function( __FUNCTION__, '4.4' ); + + if ( empty($path) ) + $path = '/'; + + // Check if the domain has been used already. We should return an error message. + if ( domain_exists($domain, $path, $site_id) ) + return __( 'ERROR: Site URL already taken.' ); + + // Need to back up wpdb table names, and create a new wp_blogs entry for new blog. + // Need to get blog_id from wp_blogs, and create new table names. + // Must restore table names at the end of function. + + if ( ! $blog_id = insert_blog($domain, $path, $site_id) ) + return __( 'ERROR: problem creating site entry.' ); + + switch_to_blog($blog_id); + install_blog($blog_id); + restore_current_blog(); + + return $blog_id; +} diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index d6a9861331..1eaada6d91 100644 --- a/wp-includes/ms-functions.php +++ b/wp-includes/ms-functions.php @@ -296,39 +296,6 @@ function remove_user_from_blog($user_id, $blog_id = '', $reassign = '') { return true; } -/** - * Create an empty blog. - * - * @since MU 1.0 - * - * @param string $domain The new blog's domain. - * @param string $path The new blog's path. - * @param string $weblog_title The new blog's title. - * @param int $site_id Optional. Defaults to 1. - * @return string|int The ID of the newly created blog - */ -function create_empty_blog( $domain, $path, $weblog_title, $site_id = 1 ) { - if ( empty($path) ) - $path = '/'; - - // Check if the domain has been used already. We should return an error message. - if ( domain_exists($domain, $path, $site_id) ) - return __( 'ERROR: Site URL already taken.' ); - - // Need to back up wpdb table names, and create a new wp_blogs entry for new blog. - // Need to get blog_id from wp_blogs, and create new table names. - // Must restore table names at the end of function. - - if ( ! $blog_id = insert_blog($domain, $path, $site_id) ) - return __( 'ERROR: problem creating site entry.' ); - - switch_to_blog($blog_id); - install_blog($blog_id); - restore_current_blog(); - - return $blog_id; -} - /** * Get the permalink for a post on another blog. * diff --git a/wp-includes/version.php b/wp-includes/version.php index 2485f6f008..14d0ac28a3 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-34752'; +$wp_version = '4.4-alpha-34753'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.