From fc0db15ebce101602fb1cbfa8f6a5cc0f8b58be4 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Mon, 6 Jan 2014 22:41:46 +0100
Subject: Happy 2014! (cherry picked from commit
 7915cde127eba2a5143fd45c6b32e81ad91bdfae)

Conflicts:
	framework/Data/Common/Mssql/TMssqlMetaData.php
	framework/Data/Common/Mysql/TMysqlMetaData.php
	framework/Data/Common/Oracle/TOracleMetaData.php
	framework/Data/Common/Pgsql/TPgsqlMetaData.php
	framework/Data/Common/Sqlite/TSqliteMetaData.php
	framework/Data/Common/TDbMetaData.php
	framework/Web/UI/ActiveControls/TCallbackClientScript.php
	framework/Web/UI/JuiControls/TJuiAutoComplete.php
	framework/Web/UI/JuiControls/TJuiControlAdapter.php
	framework/Web/UI/JuiControls/TJuiDraggable.php
	framework/Web/UI/JuiControls/TJuiDroppable.php
	framework/Web/UI/JuiControls/TJuiResizable.php
	framework/Web/UI/JuiControls/TJuiSelectable.php
	framework/Web/UI/JuiControls/TJuiSortable.php
	framework/Wsat/TWsatARGenerator.php
	framework/Wsat/TWsatService.php
	framework/Wsat/pages/TWsatGenerateAR.php
	framework/Wsat/pages/TWsatHome.php
	framework/Wsat/pages/TWsatLogin.php
	framework/Wsat/pages/TWsatScaffolding.php
---
 framework/I18N/TDateFormat.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'framework/I18N/TDateFormat.php')

diff --git a/framework/I18N/TDateFormat.php b/framework/I18N/TDateFormat.php
index 544e4973..fa6d27cf 100644
--- a/framework/I18N/TDateFormat.php
+++ b/framework/I18N/TDateFormat.php
@@ -4,7 +4,7 @@
  *
  * @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: TDateFormat.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.I18N
@@ -165,7 +165,7 @@ class TDateFormat extends TI18NControl implements IDataRenderer
 	{
 		$this->setViewState('Value',$value,'');
 	}
-	
+
 	/**
 	 * Get the default text value for this control.
 	 * @return string default text value
@@ -174,7 +174,7 @@ class TDateFormat extends TI18NControl implements IDataRenderer
 	{
 		return $this->getViewState('DefaultText','');
 	}
-	
+
 	/**
 	 * Set the default text value for this control.
 	 * @param string default text value
@@ -222,7 +222,7 @@ class TDateFormat extends TI18NControl implements IDataRenderer
 		$defaultText = $this->getDefaultText();
 		if(empty($value) && !empty($defaultText))
 			return $this->getDefaultText();
-		
+
 		$app = $this->getApplication()->getGlobalization();
 
 		//initialized the default class wide formatter
-- 
cgit v1.2.3