From d28c67315aea554ab9489e74669d4caee2771333 Mon Sep 17 00:00:00 2001
From: westi <westi@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Thu, 20 Aug 2009 19:51:43 +0000
Subject: [PATCH] Move _wp_get_user_contactmethods() into the registrations
 functions file so it is always available when required. Fixes #10662.

git-svn-id: http://svn.automattic.com/wordpress/trunk@11852 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/user.php   | 17 -----------------
 wp-includes/registration.php | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/wp-admin/includes/user.php b/wp-admin/includes/user.php
index b3e2a9373..789d26d8d 100644
--- a/wp-admin/includes/user.php
+++ b/wp-admin/includes/user.php
@@ -837,21 +837,4 @@ function default_password_nag() {
 	echo '</p></div>';
 }
 
-/**
- * Setup the default contact methods
- *
- * @access private
- * @since 
- *
- * @return array $user_contactmethods Array of contact methods and their labels.
- */
-function _wp_get_user_contactmethods() {
-	$user_contactmethods = array(
-		'aim' => __('AIM'),
-		'yim' => __('Yahoo IM'),
-		'jabber' => __('Jabber / Google Talk')
-	);
-	return apply_filters('user_contactmethods',$user_contactmethods);
-}
-
 ?>
diff --git a/wp-includes/registration.php b/wp-includes/registration.php
index 1481e24b8..c71708a09 100644
--- a/wp-includes/registration.php
+++ b/wp-includes/registration.php
@@ -300,4 +300,22 @@ function wp_create_user($username, $password, $email = '') {
 	return wp_insert_user($userdata);
 }
 
+
+/**
+ * Setup the default contact methods
+ *
+ * @access private
+ * @since 
+ *
+ * @return array $user_contactmethods Array of contact methods and their labels.
+ */
+function _wp_get_user_contactmethods() {
+	$user_contactmethods = array(
+		'aim' => __('AIM'),
+		'yim' => __('Yahoo IM'),
+		'jabber' => __('Jabber / Google Talk')
+	);
+	return apply_filters('user_contactmethods',$user_contactmethods);
+}
+
 ?>