Changeset 11097

Timestamp:

09/13/2016 09:14:06 PM (9 years ago)

Author:

r-a-y

Message:

Core: Fix fatal error with bp_core_get_iso8601_date() when an invalid date string is passed.

This error occurred on the Members Directory and selecting the
"Alphabetical" filter when attempting to parse an inactive user's last
activity. Inactive users passes the "Never active" string to
bp_core_get_iso8601_date() and the DateTime class causes a fatal
error on invalid date strings, unless we catch the exception, which this
commit is now doing.

See #5757.

Location:

trunk

Files:

• src/bp-core/bp-core-functions.php (modified) (1 diff)
• tests/phpunit/testcases/core/functions.php (modified) (1 diff)

trunk/src/bp-core/bp-core-functions.php

@@ -1309 +1309 @@
         }
 
-        $date = new DateTime( $timestamp, new DateTimeZone( 'UTC' ) );
+        try {
+            $date = new DateTime( $timestamp, new DateTimeZone( 'UTC' ) );
+
+        // Not a valid date, so return blank string.
+        } catch( Exception $e ) {
+            return '';
+        }
+
         return $date->format( DateTime::ISO8601 );
     }

trunk/tests/phpunit/testcases/core/functions.php

@@ -254 +254 @@
 
         $this->assertEquals( 'March 18, 2014 at 7:00 pm', bp_format_time( $time, $just_date, $localize_time ) );
+    }
+
+    /**
+     * @group bp_core_get_iso8601_date
+     */
+    public function test_bp_core_get_iso8601_date_invalid_date() {
+        $this->assertEquals( '', bp_core_get_iso8601_date( 'Not a date' ) );
     }