Changeset 31188 for trunk/src/wp-includes/user.php

Timestamp:

01/16/2015 01:05:52 AM (10 years ago)

Author:

wonderboymusic

Message:

In PHP 5.0.0, is_a() became deprecated in favour of the instanceof operator. Calling is_a() would result in an E_STRICT warning.

In PHP 5.3.0, is_a() is no longer deprecated, and will therefore no longer throw E_STRICT warnings.

To avoid warnings in PHP < 5.3.0, convert all is_a() calls to $var instanceof WP_Class calls.

instanceof does not throw any error if the variable being tested is not an object, it simply returns false.

Props markoheijnen, wonderboymusic.
Fixes #25672.

File:

• trunk/src/wp-includes/user.php (modified) (5 diffs)

trunk/src/wp-includes/user.php

@@ -113 +113 @@
  */
 function wp_authenticate_username_password($user, $username, $password) {
-    if ( is_a( $user, 'WP_User' ) ) {
+    if ( $user instanceof WP_User ) {
         return $user;
     }
@@ -168 +168 @@
  */
 function wp_authenticate_cookie($user, $username, $password) {
-    if ( is_a( $user, 'WP_User' ) ) {
+    if ( $user instanceof WP_User ) {
         return $user;
     }
@@ -203 +203 @@
  */
 function wp_authenticate_spam_check( $user ) {
-    if ( $user && is_a( $user, 'WP_User' ) && is_multisite() ) {
+    if ( $user instanceof WP_User && is_multisite() ) {
         /**
          * Filter whether the user has been marked as a spammer.
@@ -1711 +1711 @@
     global $wpdb;
 
-    if ( is_a( $userdata, 'stdClass' ) ) {
+    if ( $userdata instanceof stdClass ) {
         $userdata = get_object_vars( $userdata );
-    } elseif ( is_a( $userdata, 'WP_User' ) ) {
+    } elseif ( $userdata instanceof WP_User ) {
         $userdata = $userdata->to_array();
     }
@@ -1970 +1970 @@
  */
 function wp_update_user($userdata) {
-    if ( is_a( $userdata, 'stdClass' ) )
+    if ( $userdata instanceof stdClass ) {
         $userdata = get_object_vars( $userdata );
-    elseif ( is_a( $userdata, 'WP_User' ) )
+    } elseif ( $userdata instanceof WP_User ) {
         $userdata = $userdata->to_array();
+    }
 
     $ID = (int) $userdata['ID'];