Changeset 31188 for trunk/src/wp-includes/script-loader.php

Timestamp:

01/16/2015 01:05:52 AM (9 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/script-loader.php (modified) (5 diffs)

trunk/src/wp-includes/script-loader.php

@@ -779 +779 @@
     }
 
-    if ( !is_a($wp_scripts, 'WP_Scripts') )
+    if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
         $wp_scripts = new WP_Scripts();
+    }
 
     script_concat_settings();
@@ -809 +810 @@
     global $wp_scripts, $concatenate_scripts;
 
-    if ( !is_a($wp_scripts, 'WP_Scripts') )
+    if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
         return array(); // No need to run if not instantiated.
-
+    }
     script_concat_settings();
     $wp_scripts->do_concat = $concatenate_scripts;
@@ -893 +894 @@
     global $wp_scripts;
 
-    if ( !is_a($wp_scripts, 'WP_Scripts') )
+    if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
         return array(); // no need to run if nothing is queued
-
+    }
     return print_head_scripts();
 }
@@ -948 +949 @@
     global $wp_styles, $concatenate_scripts;
 
-    if ( !is_a($wp_styles, 'WP_Styles') )
+    if ( ! ( $wp_styles instanceof WP_Styles ) ) {
         $wp_styles = new WP_Styles();
+    }
 
     script_concat_settings();
@@ -978 +980 @@
     global $wp_styles, $concatenate_scripts;
 
-    if ( !is_a($wp_styles, 'WP_Styles') )
+    if ( ! ( $wp_styles instanceof WP_Styles ) ) {
         return;
+    }
 
     $wp_styles->do_concat = $concatenate_scripts;