Changeset 10555 for sites/trunk/api.wordpress.org/public_html/events/1.0/index.php

Timestamp:

01/07/2021 05:50:27 AM (6 years ago)

Author:

dd32

Message:

Events API: Avoid a PHP Warning when invalid UTF8 character sequences are encountered.

Fixes PHP warnings such as count(): Parameter must be an array or an object that implements Countable.

File:

• sites/trunk/api.wordpress.org/public_html/events/1.0/index.php (modified) (2 diffs)

sites/trunk/api.wordpress.org/public_html/events/1.0/index.php

@@ -324 +324 @@
          */
         $location_name_parts = preg_split( '/[,\s]+/u', $location_name );
+        if ( ! $location_name_parts ) {
+                // Invalid/Unsupported UTF8 characters encountered.
+                $location_name_parts = array( $location_name );
+        }
         $location_word_count = count( $location_name_parts );
 
@@ -698 +702 @@
         $country             = get_country_from_name( $location_name );
         $location_name_parts = preg_split( '/\s+/u', $location_name );
+        if ( ! $location_name_parts ) {
+                // Invalid/Unsupported UTF8 characters encountered.
+                $location_name_parts = array( $location_name );
+        }
         $location_word_count = count( $location_name_parts );