From 00c86aea6363cdffbef7db1f2dbc23f860b29f97 Mon Sep 17 00:00:00 2001 From: Jeremy Felt Date: Sun, 2 Nov 2014 02:07:23 +0000 Subject: [PATCH] Delete admin_created_user_subject() rather than deprecate As it was never used as anything more than a callback to a filter before the MU merge, and is only available in user-new.php in multisite, it is safe to remove this function entirely. Fixes #29915 Built from https://develop.svn.wordpress.org/trunk@30176 git-svn-id: http://core.svn.wordpress.org/trunk@30176 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/ms-deprecated.php | 15 --------------- wp-includes/version.php | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/wp-includes/ms-deprecated.php b/wp-includes/ms-deprecated.php index 69c3af6bc2..ffd65ca821 100644 --- a/wp-includes/ms-deprecated.php +++ b/wp-includes/ms-deprecated.php @@ -342,19 +342,4 @@ function get_blogaddress_by_domain( $domain, $path ) { } } return esc_url_raw( $url ); -} - -/** - * Supply a subject for a site invitation email. Added via filter in MU. - * Never used after the WPMU merge. - * - * @since MU - * @deprecated 4.1.0 - * - * @return string - */ -function admin_created_user_subject() { - _deprecated_function( __FUNCTION__, '4.1' ); - - return sprintf( __( '[%s] Your site invite' ), get_bloginfo( 'name' ) ); } \ No newline at end of file diff --git a/wp-includes/version.php b/wp-includes/version.php index cb3aca1aa2..b50329ea11 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.1-alpha-30175'; +$wp_version = '4.1-alpha-30176'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.