From df9c242a5e461c9f0a99c83a887c40130ae28459 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Thu, 24 Sep 2015 00:49:25 +0000
Subject: [PATCH] Users: in `WP_User::__unset()`, don't reset the deprecated
 prop `id` to `ID`. Still throw the deprecated notice.

Update unit test.

Fixes #20043.

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


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

diff --git a/wp-includes/class-wp-user.php b/wp-includes/class-wp-user.php
index 9fb9f262a1..7badeb7575 100644
--- a/wp-includes/class-wp-user.php
+++ b/wp-includes/class-wp-user.php
@@ -345,7 +345,6 @@ class WP_User {
 	public function __unset( $key ) {
 		if ( 'id' == $key ) {
 			_deprecated_argument( 'WP_User->id', '2.1', __( 'Use <code>WP_User->ID</code> instead.' ) );
-			$key = 'ID';
 		}
 
 		if ( isset( $this->data->$key ) ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 8f556c511c..260faccc33 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34465';
+$wp_version = '4.4-alpha-34466';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.