Index: branches/5.1.x/core/kernel/db/db_event_handler.php
===================================================================
diff -u -N -r14336 -r14349
--- branches/5.1.x/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 14336)
+++ branches/5.1.x/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 14349)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_event_handler.php 14336 2011-05-23 07:36:01Z alex $
+* @version	$Id: db_event_handler.php 14349 2011-05-23 08:03:57Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -2886,10 +2886,9 @@
 
 			$field = $this->Application->GetVar('field');
 			$cur_value = $this->Application->GetVar('cur_value');
+			$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
 
-			$object =& $event->getObject();
-
-			if (!$field || !$cur_value || !array_key_exists($field, $object->Fields)) {
+			if (!$field || !$cur_value || !isset($fields[$field])) {
 				return ;
 			}
 
@@ -2899,7 +2898,7 @@
 			}
 
 			$sql = 'SELECT DISTINCT '.$field.'
-					FROM '.$object->TableName.'
+					FROM '.$this->Application->getUnitOption($event->Prefix, 'TableName').'
 					WHERE '.$field.' LIKE '.$this->Conn->qstr($cur_value.'%').'
 					ORDER BY '.$field.'
 					LIMIT 0,' . $limit;