diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php index b7665ebddc..69d2884f82 100644 --- a/wp-admin/user-new.php +++ b/wp-admin/user-new.php @@ -31,10 +31,6 @@ Please click the following link to activate your user account: %%s' ), get_bloginfo( 'name' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ) ); } add_filter( 'wpmu_signup_user_notification_email', 'admin_created_user_email' ); - - function admin_created_user_subject( $text ) { - return sprintf( __( '[%s] Your site invite' ), get_bloginfo( 'name' ) ); - } } if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) { diff --git a/wp-includes/ms-deprecated.php b/wp-includes/ms-deprecated.php index 5c7bfe2a82..a8da861c7a 100644 --- a/wp-includes/ms-deprecated.php +++ b/wp-includes/ms-deprecated.php @@ -345,3 +345,18 @@ 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 fd2566a64c..32d671a434 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.1-alpha-30004'; +$wp_version = '4.1-alpha-30005'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.