From 86d87c21d93ef7e44156c9d0814de4d7efc685c7 Mon Sep 17 00:00:00 2001
From: Mzhelskiy Maxim <rus.engine@gmail.com>
Date: Tue, 3 Aug 2010 20:13:44 +0000
Subject: [PATCH]

---
 engine/classes/Entity.class.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/engine/classes/Entity.class.php b/engine/classes/Entity.class.php
index 0780e1d1..cce644f4 100644
--- a/engine/classes/Entity.class.php
+++ b/engine/classes/Entity.class.php
@@ -60,11 +60,18 @@ abstract class Entity extends Object {
 	 */
 	public function __call($sName,$aArgs) {
 		$sType=strtolower(substr($sName,0,3));
-		if (!strpos($sName,'_') and in_array($sType,array('get','set'))) {			
+		if (!strpos($sName,'_') and in_array($sType,array('get','set'))) {
 			$sKey=strtolower(preg_replace('/([^A-Z])([A-Z])/',"$1_$2",substr($sName,3)));
 			if ($sType=='get') {
-				if (isset($this->_aData[$sKey])) {					
+				if (isset($this->_aData[$sKey])) {
 					return $this->_aData[$sKey];
+				} else {
+					if (preg_match('/Entity([^_]+)/',get_class($this),$sModulePrefix)) {
+						$sModulePrefix=strtolower($sModulePrefix[1]).'_';
+						if (isset($this->_aData[$sModulePrefix.$sKey])) {
+							return $this->_aData[$sModulePrefix.$sKey];
+						}
+					}
 				}
 				return null;
 			} elseif ($sType=='set' and key_exists(0,$aArgs)) {