From 6228873cf9d6471463d2413e7dfd7447f759baf2 Mon Sep 17 00:00:00 2001
From: "christophe.boulain" <>
Date: Wed, 3 Dec 2008 14:22:03 +0000
Subject: Merge from trunk

---
 framework/Data/SqlMap/DataMapper/TLazyLoadList.php              | 1 -
 framework/Data/SqlMap/DataMapper/TPropertyAccess.php            | 3 ++-
 framework/Data/SqlMap/DataMapper/TSqlMapCache.php               | 1 -
 framework/Data/SqlMap/DataMapper/TSqlMapException.php           | 1 -
 framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php           | 1 -
 framework/Data/SqlMap/DataMapper/TSqlMapTypeHandlerRegistry.php | 1 -
 6 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'framework/Data/SqlMap/DataMapper')

diff --git a/framework/Data/SqlMap/DataMapper/TLazyLoadList.php b/framework/Data/SqlMap/DataMapper/TLazyLoadList.php
index 02b08e8e..69b20bf6 100644
--- a/framework/Data/SqlMap/DataMapper/TLazyLoadList.php
+++ b/framework/Data/SqlMap/DataMapper/TLazyLoadList.php
@@ -142,4 +142,3 @@ class TObjectProxy
 	}
 }
 
-?>
diff --git a/framework/Data/SqlMap/DataMapper/TPropertyAccess.php b/framework/Data/SqlMap/DataMapper/TPropertyAccess.php
index 23e854ac..a27cb50f 100644
--- a/framework/Data/SqlMap/DataMapper/TPropertyAccess.php
+++ b/framework/Data/SqlMap/DataMapper/TPropertyAccess.php
@@ -106,7 +106,8 @@ class TPropertyAccess
 					$object = $object->{$getter}();
 				else if(in_array($prop, array_keys(get_object_vars($object))))
 					$object = $object->{$prop};
-				return false;
+				else
+					return false;
 			}
 			else
 				return false;
diff --git a/framework/Data/SqlMap/DataMapper/TSqlMapCache.php b/framework/Data/SqlMap/DataMapper/TSqlMapCache.php
index 61c5bb95..05b72e08 100644
--- a/framework/Data/SqlMap/DataMapper/TSqlMapCache.php
+++ b/framework/Data/SqlMap/DataMapper/TSqlMapCache.php
@@ -225,4 +225,3 @@ class TSqlMapApplicationCache implements ICache
 	}
 }
 
-?>
diff --git a/framework/Data/SqlMap/DataMapper/TSqlMapException.php b/framework/Data/SqlMap/DataMapper/TSqlMapException.php
index 69a0b0cd..0bf0ac32 100644
--- a/framework/Data/SqlMap/DataMapper/TSqlMapException.php
+++ b/framework/Data/SqlMap/DataMapper/TSqlMapException.php
@@ -113,4 +113,3 @@ class TSqlMapExecutionException extends TSqlMapException
 {
 }
 
-?>
diff --git a/framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php b/framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php
index b3a88653..86171c1e 100644
--- a/framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php
+++ b/framework/Data/SqlMap/DataMapper/TSqlMapPagedList.php
@@ -206,4 +206,3 @@ class TSqlMapPagedList extends TPagedList
 	}
 }
 
-?>
diff --git a/framework/Data/SqlMap/DataMapper/TSqlMapTypeHandlerRegistry.php b/framework/Data/SqlMap/DataMapper/TSqlMapTypeHandlerRegistry.php
index aa39dce1..05866395 100644
--- a/framework/Data/SqlMap/DataMapper/TSqlMapTypeHandlerRegistry.php
+++ b/framework/Data/SqlMap/DataMapper/TSqlMapTypeHandlerRegistry.php
@@ -190,4 +190,3 @@ abstract class TSqlMapTypeHandler extends TComponent
 	public abstract function createNewInstance($row=null);
 }
 
-?>
-- 
cgit v1.2.3