From 8cce0f1607c9153fd02cb28e901f3b0de4412eee Mon Sep 17 00:00:00 2001 From: Dion Hulse Date: Mon, 5 Jan 2015 01:40:43 +0000 Subject: [PATCH] Preinitialize WP_User::$data to an object in the event an empty user object is created. Avoids a "Creating default object from empty value" PHP Warning. Fixes #28019 git-svn-id: https://develop.svn.wordpress.org/trunk@31049 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/capabilities.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/wp-includes/capabilities.php b/src/wp-includes/capabilities.php index 3c665f0bd4..16148b206d 100644 --- a/src/wp-includes/capabilities.php +++ b/src/wp-includes/capabilities.php @@ -422,7 +422,7 @@ class WP_User { * * @since 2.0.0 * @access private - * @var array + * @var object */ var $data; @@ -521,13 +521,17 @@ class WP_User { $id = 0; } - if ( $id ) + if ( $id ) { $data = self::get_data_by( 'id', $id ); - else + } else { $data = self::get_data_by( 'login', $name ); + } - if ( $data ) + if ( $data ) { $this->init( $data, $blog_id ); + } else { + $this->data = new stdClass; + } } /**