- Patch #41133 by DriesK: as of PHP 5.1.0, strtotime() returns FALSE on failure instead of -1.

  Changed code to be compatible with all versions.

1 files changed, 5 insertions, 5 deletions

diff --git a/modules/aggregator.module b/modules/aggregator.module
index 8ac5ca705..8c1007ae6 100644
--- a/modules/aggregator.module
+++ b/modules/aggregator.module
@@ -484,7 +484,7 @@ function aggregator_parse_w3cdtf($date_str) {
     return $epoch;
   }
   else {
-    return -1;
+    return FALSE;
   }
 }
 
@@ -580,10 +580,10 @@ function aggregator_parse_feed(&$data, $feed) {
     else if ($item['MODIFIED']) $date = $item['MODIFIED'];                 // Atom XML
     else $date = 'now';
 
-    $timestamp = strtotime($date); // strtotime() returns -1 on failure
-    if ($timestamp < 0) {
-      $timestamp = aggregator_parse_w3cdtf($date); // also returns -1 on failure
-      if ($timestamp < 0) {
+    $timestamp = strtotime($date); // As of PHP 5.1.0, strtotime returns FALSE on failure instead of -1.
+    if ($timestamp <= 0) {
+      $timestamp = aggregator_parse_w3cdtf($date); // Returns FALSE on failure
+      if (!$timestamp) {
         $timestamp = time(); // better than nothing
       }
     }