From 7d8dfe52cd1e61e32b3773504bbdade14c2fd7b7 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sun, 20 Apr 2014 14:59:13 -0400
Subject: [PATCH] Fixed test break.

---
 framework/base/Formatter.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/framework/base/Formatter.php b/framework/base/Formatter.php
index d45551d339..c958112892 100644
--- a/framework/base/Formatter.php
+++ b/framework/base/Formatter.php
@@ -352,7 +352,11 @@ class Formatter extends Component
             if (is_numeric($value) || $value === '') {
                 $value = (double)$value;
             } else {
-                $date = new DateTime($value);
+                try {
+                    $date = new DateTime($value);
+                } catch (\Exception $e) {
+                    return false;
+                }
                 $value = $date->format('U');
             }
             return $value;
@@ -506,7 +510,7 @@ class Formatter extends Component
                 // to create a DateInterval with it
                 try {
                     $interval = new \DateInterval($value);
-                } catch (Exception $e) {
+                } catch (\Exception $e) {
                     // invalid date/time and invalid interval
                     return $this->nullDisplay;
                 }