Changeset 25606

Timestamp:

09/24/2013 06:13:18 PM (11 years ago)

Author:

nacin

Message:

Introduce wp_get_user_contact_methods() as a public version of _wp_get_user_contactmethods.

props johnnyb.
fixes #24273.

Location:

trunk/src

Files:

• wp-admin/includes/user.php (modified) (1 diff)
• wp-admin/user-edit.php (modified) (1 diff)
• wp-includes/user.php (modified) (2 diffs)

trunk/src/wp-admin/includes/user.php

@@ -86 +86 @@
         $user->description = trim( $_POST['description'] );
 
-    foreach ( _wp_get_user_contactmethods( $user ) as $method => $name ) {
+    foreach ( wp_get_user_contact_methods( $user ) as $method => $name ) {
         if ( isset( $_POST[$method] ))
             $user->$method = sanitize_text_field( $_POST[$method] );

trunk/src/wp-admin/user-edit.php

@@ -351 +351 @@
 
 <?php
-    foreach (_wp_get_user_contactmethods( $profileuser ) as $name => $desc) {
+    foreach ( wp_get_user_contact_methods( $profileuser ) as $name => $desc ) {
 ?>
 <tr>

trunk/src/wp-includes/user.php

@@ -1540 +1540 @@
 function _get_additional_user_keys( $user ) {
     $keys = array( 'first_name', 'last_name', 'nickname', 'description', 'rich_editing', 'comment_shortcuts', 'admin_color', 'use_ssl', 'show_admin_bar_front' );
-    return array_merge( $keys, array_keys( _wp_get_user_contactmethods( $user ) ) );
-}
-
-/**
- * Set up the contact methods.
+    return array_merge( $keys, array_keys( wp_get_user_contact_methods( $user ) ) );
+}
+
+/**
+ * Set up the user contact methods.
  *
  * Default contact methods were removed in 3.6. A filter dictates contact methods.
  *
- * @since 2.9.0
- * @access private
- *
- * @param object $user User data object (optional).
- * @return array $user_contactmethods Array of contact methods and their labels.
- */
-function _wp_get_user_contactmethods( $user = null ) {
-    $user_contactmethods = array();
+ * @since 3.7.0
+ *
+ * @param WP_User $user Optional. WP_User object.
+ * @return array Array of contact methods and their labels.
+ */
+function wp_get_user_contact_methods( $user = null ) {
+    $methods = array();
     if ( get_site_option( 'initial_db_version' ) < 23588 ) {
-        $user_contactmethods = array(
+        $methods = array(
             'aim'    => __( 'AIM' ),
             'yim'    => __( 'Yahoo IM' ),
@@ -1563 +1562 @@
         );
     }
-    return apply_filters( 'user_contactmethods', $user_contactmethods, $user );
+
+    /**
+     * Filter the user contact methods.
+     *
+     * @since 2.9.0
+     *
+     * @param array   $methods Array of contact methods and their labels.
+     * @param WP_User $user    Optional. WP_User object.
+     */
+    return apply_filters( 'user_contactmethods', $methods, $user );
+}
+
+/**
+ * The old private function for setting up user contact methods.
+ *
+ * @since 2.9.0
+ * @access private
+ */
+function _wp_get_user_contactmethods( $user = null ) {
+    return wp_get_user_contact_methods( $user );
 }