From a40e30e7f4184012d38fe806239fbe0c24fb74cb Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Thu, 10 Sep 2015 21:33:33 +0000
Subject: [PATCH] Move 2 ad hoc user admin functions:

* Move `use_ssl_preference()` from `wp-admin/user-edit.php` to `wp-admin/includes/user.php`.
* Move `admin_created_user_email()` from `wp-admin/user-new.php` to `wp-admin/includes/user.php`.

See #33813.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33990 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/user.php | 35 +++++++++++++++++++++++++++++++++++
 wp-admin/user-edit.php     | 16 ----------------
 wp-admin/user-new.php      | 18 ------------------
 wp-includes/version.php    |  2 +-
 4 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php
index 22064602f6..3c2e26e186 100644
--- a/wp-admin/includes/user.php
+++ b/wp-admin/includes/user.php
@@ -464,4 +464,39 @@ jQuery(document).ready( function($) {
 });
 </script>
 <?php
+}
+
+/**
+ * Optional SSL preference that can be turned on by hooking to the 'personal_options' action.
+ *
+ * @since 2.7.0
+ *
+ * @param object $user User data object
+ */
+function use_ssl_preference($user) {
+?>
+	<tr class="user-use-ssl-wrap">
+		<th scope="row"><?php _e('Use https')?></th>
+		<td><label for="use_ssl"><input name="use_ssl" type="checkbox" id="use_ssl" value="1" <?php checked('1', $user->use_ssl); ?> /> <?php _e('Always use https when visiting the admin'); ?></label></td>
+	</tr>
+<?php
+}
+
+/**
+ *
+ * @param string $text
+ * @return string
+ */
+function admin_created_user_email( $text ) {
+	$roles = get_editable_roles();
+	$role = $roles[ $_REQUEST['role'] ];
+	/* translators: 1: Site name, 2: site URL, 3: role */
+	return sprintf( __( 'Hi,
+You\'ve been invited to join \'%1$s\' at
+%2$s with the role of %3$s.
+If you do not want to join this site please ignore
+this email. This invitation will expire in a few days.
+
+Please click the following link to activate your user account:
+%%s' ), get_bloginfo( 'name' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ) );
 }
\ No newline at end of file
diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index d97dbad7b6..aa8ab1adee 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -59,22 +59,6 @@ $wp_http_referer = remove_query_arg(array('update', 'delete_count'), $wp_http_re
 
 $user_can_edit = current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' );
 
-/**
- * Optional SSL preference that can be turned on by hooking to the 'personal_options' action.
- *
- * @since 2.7.0
- *
- * @param object $user User data object
- */
-function use_ssl_preference($user) {
-?>
-	<tr class="user-use-ssl-wrap">
-		<th scope="row"><?php _e('Use https')?></th>
-		<td><label for="use_ssl"><input name="use_ssl" type="checkbox" id="use_ssl" value="1" <?php checked('1', $user->use_ssl); ?> /> <?php _e('Always use https when visiting the admin'); ?></label></td>
-	</tr>
-<?php
-}
-
 /**
  * Filter whether to allow administrators on Multisite to edit every user.
  *
diff --git a/wp-admin/user-new.php b/wp-admin/user-new.php
index 2228fc7354..9dce2c5e9a 100644
--- a/wp-admin/user-new.php
+++ b/wp-admin/user-new.php
@@ -26,24 +26,6 @@ if ( is_multisite() ) {
 }
 
 if ( is_multisite() ) {
-	/**
-	 *
-	 * @param string $text
-	 * @return string
-	 */
-	function admin_created_user_email( $text ) {
-		$roles = get_editable_roles();
-		$role = $roles[ $_REQUEST['role'] ];
-		/* translators: 1: Site name, 2: site URL, 3: role */
-		return sprintf( __( 'Hi,
-You\'ve been invited to join \'%1$s\' at
-%2$s with the role of %3$s.
-If you do not want to join this site please ignore
-this email. This invitation will expire in a few days.
-
-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' );
 }
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index c87f4146de..460aefdb60 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34020';
+$wp_version = '4.4-alpha-34021';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.