Index: branches/RC/core/kernel/db/db_event_handler.php
===================================================================
diff -u -N -r9275 -r9277
--- branches/RC/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 9275)
+++ branches/RC/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 9277)
@@ -2096,29 +2096,35 @@
 		}
 
 		/**
-		 * Enter description here...
+		 * Returns auto-complete values for ajax-dropdown
 		 *
 		 * @param kEvent $event
 		 */
 		function OnSuggestValues(&$event)
 		{
-			safeDefine('DBG_SKIP_REPORTING', 1);
-			$lang =& $this->Application->recallObject('lang.current');
-			header('Content-type: text/xml; charset='.$lang->GetDBField('Charset'));
+			$this->Application->XMLHeader();
 
 			$field = $this->Application->GetVar('field');
 			$cur_value = $this->Application->GetVar('cur_value');
-			if (!$field || !$cur_value) exit;
-			$obj =& $event->getObject();
-			$q = 'SELECT DISTINCT '.$field.' FROM '.$obj->TableName.'
-						WHERE '.$field.' LIKE '.$this->Conn->qstr($cur_value.'%').' ORDER BY '.$field.' LIMIT 0,20';
-			$data = $this->Conn->GetCol($q);
+			if (!$field || !$cur_value) {
+				exit;
+			}
+
+			$object =& $event->getObject();
+			$sql = 'SELECT DISTINCT '.$field.'
+					FROM '.$object->TableName.'
+					WHERE '.$field.' LIKE '.$this->Conn->qstr($cur_value.'%').'
+					ORDER BY '.$field.'
+					LIMIT 0,20';
+			$data = $this->Conn->GetCol($sql);
+
 			echo '<suggestions>';
 			foreach ($data as $item) {
-				echo "<item>$item</item>";
+				echo '<item>'.$item.'</item>';
 			}
 			echo '</suggestions>';
-			exit;
+
+			$event->status = erSTOP;
 		}
 
 	}