Changeset 43221 for branches/4.9/src/wp-includes/compat.php

Timestamp:

05/10/2018 05:58:46 PM (7 years ago)

Author:

SergeyBiryukov

Message:

General: In the is_countable() polyfill, if the provided object implements SimpleXMLElement or ResourceBundle, consider it countable.

Props ayeshrajans, jrf, desrosj.
Merges [43220] to the 4.9 branch.
Fixes #43583.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-includes/compat.php (modified) (1 diff)

branches/4.9/src/wp-includes/compat.php

@@ -513 +513 @@
      */
     function is_countable( $var ) {
-        return ( is_array( $var ) || $var instanceof Countable );
+        return ( is_array( $var )
+            || $var instanceof Countable
+            || $var instanceof SimpleXMLElement
+            || $var instanceof ResourceBundle
+        );
     }
 }