Changeset 31049

Timestamp:

01/05/2015 01:40:43 AM (10 years ago)

Author:

dd32

Message:

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

File:

• trunk/src/wp-includes/capabilities.php (modified) (2 diffs)

trunk/src/wp-includes/capabilities.php

@@ -423 +423 @@
      * @since 2.0.0
      * @access private
-     * @var array
+     * @var object
      */
     var $data;
@@ -522 +522 @@
         }
 
-        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;
+        }
     }