Changeset 24627

Timestamp:

12/01/09 01:13:00 (3 years ago)

Author:

FabianLange

Message:

[1.3, 1.4] reverted r24605 because it introduced a regression (reopens #7753, #7702)

Files:

• branches/1.3/lib/validator/sfValidatorDate.class.php (modified) (2 diffs)
• branches/1.4/lib/validator/sfValidatorDate.class.php (modified) (2 diffs)

branches/1.3/lib/validator/sfValidatorDate.class.php

@@ -65 +65 @@
-  protected function doClean($value)
-  {
+    // check date format
+    if ($regex = $this->getOption('date_format'))
+    {
+      if (!preg_match($regex, $value, $match))
+      {
+        throw new sfValidatorError($this, 'bad_format', array('value' => $value, 'date_format' => $this->getOption('date_format_error') ? $this->getOption('date_format_error') : $this->getOption('date_format')));
+      }
+
+      $value = $match;
+    }
+
-    // convert array to date string
-    if (is_array($value))
@@ -71 +82 @@
-    }
-
-    // check date format
-    if ($regex = $this->getOption('date_format'))
-    {
-      if (!preg_match($regex, $value, $match))
-      {
-        throw new sfValidatorError($this, 'bad_format', array('value' => $value, 'date_format' => $this->getOption('date_format_error') ? $this->getOption('date_format_error') : $this->getOption('date_format')));
-      }
-
-      $value = $match;
-    }
-    
-    // convert timestamp to date number format
-    if (ctype_digit($value))

branches/1.4/lib/validator/sfValidatorDate.class.php

@@ -65 +65 @@
-  protected function doClean($value)
-  {
+    // check date format
+    if ($regex = $this->getOption('date_format'))
+    {
+      if (!preg_match($regex, $value, $match))
+      {
+        throw new sfValidatorError($this, 'bad_format', array('value' => $value, 'date_format' => $this->getOption('date_format_error') ? $this->getOption('date_format_error') : $this->getOption('date_format')));
+      }
+
+      $value = $match;
+    }
+
-    // convert array to date string
-    if (is_array($value))
@@ -71 +82 @@
-    }
-
-    // check date format
-    if ($regex = $this->getOption('date_format'))
-    {
-      if (!preg_match($regex, $value, $match))
-      {
-        throw new sfValidatorError($this, 'bad_format', array('value' => $value, 'date_format' => $this->getOption('date_format_error') ? $this->getOption('date_format_error') : $this->getOption('date_format')));
-      }
-
-      $value = $match;
-    }
-    
-    // convert timestamp to date number format
-    if (ctype_digit($value))