From 7770c298450237e092d6d801fd547609ba2db230 Mon Sep 17 00:00:00 2001
From: xue <>
Date: Mon, 13 Mar 2006 02:38:47 +0000
Subject: TDataFieldAccessor can access public member variables now. Added
 implementation to cope with low PHP versions.

---
 framework/Data/TDataFieldAccessor.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'framework/Data/TDataFieldAccessor.php')

diff --git a/framework/Data/TDataFieldAccessor.php b/framework/Data/TDataFieldAccessor.php
index e0c87add..a28b9d1f 100644
--- a/framework/Data/TDataFieldAccessor.php
+++ b/framework/Data/TDataFieldAccessor.php
@@ -57,7 +57,12 @@ class TDataFieldAccessor
 			else if(is_object($data))
 			{
 				if(strpos($field,'.')===false)  // simple field
-					return call_user_func(array($data,'get'.$field));
+				{
+					if(property_exists($data,$field))
+						return $data->{$field};
+					else
+						return call_user_func(array($data,'get'.$field));
+				}
 				else // field in the format of xxx.yyy.zzz
 				{
 					$object=$data;
@@ -82,11 +87,12 @@ class TDataFieldAccessor
 			{
 				if(strpos($field,'.')===false)  // simple field
 				{
-					$getter='get'.$field;
-					if(is_callable(array($data,$getter)))
-						return call_user_func(array($data,$getter));
-					else if(in_array($field, array_keys(get_object_vars($data))))
+					if(property_exists($data,$field))
 						return $data->{$field};
+					else if(is_callable(array($data,'get'.$field)))
+						return call_user_func(array($data,'get'.$field));
+					else
+						throw new TInvalidDataValueException('datafieldaccessor_datafield_invalid',$field);
 				}
 				else // field in the format of xxx.yyy.zzz
 				{
-- 
cgit v1.2.3