Index: branches/5.2.x/core/kernel/db/db_event_handler.php
===================================================================
diff -u -N -r16414 -r16415
--- branches/5.2.x/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 16414)
+++ branches/5.2.x/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 16415)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_event_handler.php 16414 2016-11-13 20:08:52Z alex $
+* @version	$Id: db_event_handler.php 16415 2016-11-13 20:59:35Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -101,6 +101,7 @@
 				'OnLoad' => Array ('self' => 'view', 'subitem' => 'view'),
 				'OnItemBuild' => Array ('self' => 'view', 'subitem' => 'view'),
 				'OnSuggestValues' => Array ('self' => 'admin', 'subitem' => 'admin'),
+				'OnSuggestValuesJSON' => Array ('self' => 'admin', 'subitem' => 'admin'),
 
 				'OnBuild' => Array ('self' => true),
 
@@ -3472,37 +3473,85 @@
 		{
 			$event->status = kEvent::erSTOP;
 
-			$field = $this->Application->GetVar('field');
-			$cur_value = $this->Application->GetVar('cur_value');
+			$this->Application->XMLHeader();
+			$data = $this->getAutoCompleteSuggestions($event, $this->Application->GetVar('cur_value'));
 			$fields = $this->Application->getUnitOption($event->Prefix, 'Fields');
 
+			echo '<suggestions>';
+
+			if ( kUtil::isAssoc($data) ) {
+				foreach ($data as $key => $title) {
+					echo '<item value="' . kUtil::escape($key, kUtil::ESCAPE_HTML) . '">' . kUtil::escape($title, kUtil::ESCAPE_HTML) . '</item>';
+				}
+			}
+			else {
+				foreach ($data as $title) {
+					echo '<item>' . kUtil::escape($title, kUtil::ESCAPE_HTML) . '</item>';
+				}
+			}
+
+			echo '</suggestions>';
+		}
+
+		/**
+		 * Returns auto-complete values for jQueryUI.AutoComplete
+		 *
+		 * @param kEvent $event
+		 * @return void
+		 * @access protected
+		 */
+		protected function OnSuggestValuesJSON(kEvent $event)
+		{
+			$event->status = kEvent::erSTOP;
+
+			$data = $this->getAutoCompleteSuggestions($event, $this->Application->GetVar('term'));
+
+			if ( kUtil::isAssoc($data) ) {
+				$transformed_data = array();
+
+				foreach ($data as $key => $title) {
+					$transformed_data[] = array('value' => $key, 'label' => $title);
+				}
+
+				$data = $transformed_data;
+			}
+
+			echo json_encode($data);
+		}
+
+		/**
+		 * Prepares a suggestion list based on a given term.
+		 *
+		 * @param kEvent $event Event.
+		 * @param string $term Term.
+		 *
+		 * @return Array
+		 * @access protected
+		 */
+		protected function getAutoCompleteSuggestions(kEvent $event, $term)
+		{
 			$object = $event->getObject();
+			/* @var $object kDBItem */
 
-			if ( !$field || !$cur_value || !$object->isField($field) ) {
-				return;
+			$field = $this->Application->GetVar('field');
+
+			if ( !$field || !$term || !$object->isField($field) ) {
+				return array();
 			}
 
 			$limit = $this->Application->GetVar('limit');
+
 			if ( !$limit ) {
 				$limit = 20;
 			}
 
 			$sql = 'SELECT DISTINCT ' . $field . '
 					FROM ' . $this->Application->getUnitOption($event->Prefix, 'TableName') . '
-					WHERE ' . $field . ' LIKE ' . $this->Conn->qstr($cur_value . '%') . '
+					WHERE ' . $field . ' LIKE ' . $this->Conn->qstr($term . '%') . '
 					ORDER BY ' . $field . '
 					LIMIT 0,' . $limit;
-			$data = $this->Conn->GetCol($sql);
 
-			$this->Application->XMLHeader();
-
-			echo '<suggestions>';
-
-			foreach ($data as $item) {
-				echo '<item>' . kUtil::escape($item, kUtil::ESCAPE_HTML) . '</item>';
-			}
-
-			echo '</suggestions>';
+			return $this->Conn->GetCol($sql);
 		}
 
 		/**