Merge pull request #530 from pradosoft/prado-3.2.43.2.4prado-3.2

Backports for Prado 3.2.4

1 files changed, 3 insertions, 5 deletions

diff --git a/framework/Util/TSimpleDateFormatter.php b/framework/Util/TSimpleDateFormatter.php
index 295a2d60..18e71529 100644
--- a/framework/Util/TSimpleDateFormatter.php
+++ b/framework/Util/TSimpleDateFormatter.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TSimpleDateFormatter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Util
  */
 
@@ -40,7 +39,6 @@
  * </code>
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TSimpleDateFormatter.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Util
  * @since 3.0
  */
@@ -177,7 +175,7 @@ class TSimpleDateFormatter
 		if(is_numeric($value))
 			return $s->getDate($value);
 		else
-			return $s->parseDate($value);		
+			return $s->parseDate($value);
 	}
 
 	/**
@@ -302,7 +300,7 @@ class TSimpleDateFormatter
 		if(!$defaultToCurrentTime && ($month === null || $day === null || $year === null))
 			return null;
 		else
-		{		
+		{
 			if(empty($year)) {
 				$year = date('Y');
 			}