From 56fee292c37e162c03fab9eeadd6a8b9ab85c251 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Mon, 4 Sep 2006 19:15:47 +0000
Subject: merge from 3.0 branch till 1387

---
 framework/Util/TDataFieldAccessor.php | 2 +-
 framework/Util/TDateTimeStamp.php     | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'framework/Util')

diff --git a/framework/Util/TDataFieldAccessor.php b/framework/Util/TDataFieldAccessor.php
index 6af972e9..a3dcbb00 100644
--- a/framework/Util/TDataFieldAccessor.php
+++ b/framework/Util/TDataFieldAccessor.php
@@ -50,7 +50,7 @@ class TDataFieldAccessor
 	 */
 	public static function getDataFieldValue($data,$field)
 	{
-		if(Prado::getApplication()->getMode()===TApplication::STATE_PERFORMANCE)
+		if(Prado::getApplication()->getMode()===TApplicationMode::Performance)
 		{
 			if(is_array($data) || ($data instanceof ArrayAccess))
 				return $data[$field];
diff --git a/framework/Util/TDateTimeStamp.php b/framework/Util/TDateTimeStamp.php
index d7093ec3..6a9c9553 100644
--- a/framework/Util/TDateTimeStamp.php
+++ b/framework/Util/TDateTimeStamp.php
@@ -30,6 +30,7 @@
 
 if (!defined('ADODB_ALLOW_NEGATIVE_TS') 
 	&& !defined('ADODB_NO_NEGATIVE_TS')) define('ADODB_NO_NEGATIVE_TS',1);
+
 /**
  * TDateTimeStamp Class
  *
@@ -697,4 +698,4 @@ class TDateTimeStamp
 	}
 }
 
-?>
\ No newline at end of file
+?>
-- 
cgit v1.2.3