From 6d405d34dae096fb8df71173e3b46cb86b441fd1 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Fri, 21 Aug 2015 05:33:25 +0000
Subject: [PATCH] Docs: Clarify the DocBlock summary and add a description and
 return description for `_get_additional_user_keys()`.

As noted in the description, returned keys being set is dependent on the existence of those keys in user meta at the point where `_get_additional_user_keys()` is called in `wp_update_user()`.

Fixes #29120.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33654 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/user.php    | 7 +++++--
 wp-includes/version.php | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/wp-includes/user.php b/wp-includes/user.php
index 1cd2db22e5..eae02db611 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -2351,13 +2351,16 @@ function wp_create_user($username, $password, $email = '') {
 }
 
 /**
- * Return a list of meta keys that wp_insert_user() is supposed to set.
+ * Returns a list of meta keys to be (maybe) populated in wp_update_user().
+ *
+ * Values actually keys returned via this function are dependent on the presence
+ * of those keys in the user meta data.
  *
  * @since 3.3.0
  * @access private
  *
  * @param WP_User $user WP_User instance.
- * @return array
+ * @return array List of user keys to be populated in wp_update_user().
  */
 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' );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e6b229c7a1..82918d0592 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-33686';
+$wp_version = '4.4-alpha-33687';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.