Changeset 467 for branches/eli_branch/lib/Validator.inc.php

Timestamp:

Feb 19, 2014 2:28:00 AM (10 years ago)

Author:

anonymous

Message:

Merged in changes from trunk to finish Eli's branch.

Location:

branches/eli_branch

Files:

• . (modified) (1 prop)
• lib/Validator.inc.php (modified) (4 diffs)

branches/eli_branch/lib/Validator.inc.php

@@ -218 +218 @@
     /**
      * Verifies that date can be processed by the strtotime function.
+     * Empty strings are considered valid. Other values are tested on their return value from strtotime(). Null values will fail.
      *
      * @param  string  $val The input data to validate.
@@ -226 +227 @@
         $app =& App::getInstance();
 
-        if ('' == trim($val)) {
+        if (is_string($val) && '' === trim($val)) {
             // Don't be too bothered about empty strings.
             return true;
@@ -232 +233 @@
 
         $timestamp = strtotime($val);
-        // Return values change between php4 and php5.
-        if ('' != trim($val) && ($timestamp === -1 || $timestamp === false)) {
+        if (!$timestamp || $timestamp < 1) {
             return false;
         } else {
@@ -239 +239 @@
         }
     }
-
 
     /**