Changeset 31188 for trunk/src/wp-includes/functions.wp-styles.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/functions.wp-styles.php (modified) (7 diffs)

trunk/src/wp-includes/functions.wp-styles.php

@@ -35 +35 @@
 
     global $wp_styles;
-    if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+    if ( ! ( $wp_styles instanceof WP_Styles ) ) {
         if ( ! did_action( 'init' ) )
             _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
@@ -68 +68 @@
 function wp_add_inline_style( $handle, $data ) {
     global $wp_styles;
-    if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+    if ( ! ( $wp_styles instanceof WP_Styles ) ) {
         if ( ! did_action( 'init' ) )
             _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
@@ -103 +103 @@
 function wp_register_style( $handle, $src, $deps = array(), $ver = false, $media = 'all' ) {
     global $wp_styles;
-    if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+    if ( ! ( $wp_styles instanceof WP_Styles ) ) {
         if ( ! did_action( 'init' ) )
             _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
@@ -125 +125 @@
 function wp_deregister_style( $handle ) {
     global $wp_styles;
-    if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+    if ( ! ( $wp_styles instanceof WP_Styles ) ) {
         if ( ! did_action( 'init' ) )
             _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
@@ -158 +158 @@
 function wp_enqueue_style( $handle, $src = false, $deps = array(), $ver = false, $media = 'all' ) {
     global $wp_styles;
-    if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+    if ( ! ( $wp_styles instanceof WP_Styles ) ) {
         if ( ! did_action( 'init' ) )
             _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
@@ -184 +184 @@
 function wp_dequeue_style( $handle ) {
     global $wp_styles;
-    if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+    if ( ! ( $wp_styles instanceof WP_Styles ) ) {
         if ( ! did_action( 'init' ) )
             _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
@@ -208 +208 @@
 function wp_style_is( $handle, $list = 'enqueued' ) {
     global $wp_styles;
-    if ( ! is_a( $wp_styles, 'WP_Styles' ) ) {
+    if ( ! ( $wp_styles instanceof WP_Styles ) ) {
         if ( ! did_action( 'init' ) )
             _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),