From 48213a584267b549e8bc39072e0e4329c414bf0a Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Tue, 22 Sep 2015 10:02:24 +0000
Subject: [PATCH] Docs: Fix some syntactical issues and add missing parameter
 and return descriptions to the DocBlock for the `WP_User::__get()` magic
 method.

See #32246.

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


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

diff --git a/wp-includes/class-wp-user.php b/wp-includes/class-wp-user.php
index 48cb47dce1..20a00ff139 100644
--- a/wp-includes/class-wp-user.php
+++ b/wp-includes/class-wp-user.php
@@ -283,11 +283,13 @@ class WP_User {
 	}
 
 	/**
-	 * Magic method for accessing custom fields
+	 * Magic method for accessing custom fields.
 	 *
 	 * @since 3.3.0
-	 * @param string $key
-	 * @return mixed
+	 * @access public
+	 *
+	 * @param string $key User meta key to retrieve.
+	 * @return mixed Value of the given user meta key (if set). If `$key` is 'id', the user ID.
 	 */
 	public function __get( $key ) {
 		if ( 'id' == $key ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 9ad8a9c2d3..009c1f8d33 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34388';
+$wp_version = '4.4-alpha-34389';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.