Index: branches/5.2.x/core/kernel/db/cat_event_handler.php
===================================================================
diff -u -N -r16358 -r16374
--- branches/5.2.x/core/kernel/db/cat_event_handler.php	(.../cat_event_handler.php)	(revision 16358)
+++ branches/5.2.x/core/kernel/db/cat_event_handler.php	(.../cat_event_handler.php)	(revision 16374)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: cat_event_handler.php 16358 2016-07-12 07:38:13Z alex $
+* @version	$Id: cat_event_handler.php 16374 2016-07-25 08:32:54Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -444,8 +444,11 @@
 			$object = $event->getObject();
 			/* @var $object kDBList */
 
-			$search_sql = '	FROM ' . TABLE_PREFIX . 'ses_' . $this->Application->GetSID() . '_' . TABLE_PREFIX . 'Search
-							search_result JOIN %1$s ON %1$s.ResourceId = search_result.ResourceId';
+			/** @var kSearchHelper $search_helper */
+			$search_helper = $this->Application->recallObject('SearchHelper');
+
+			$search_sql = '	FROM ' . $search_helper->getSearchTable() . ' search_result
+							JOIN %1$s ON %1$s.ResourceId = search_result.ResourceId';
 			$sql = str_replace('FROM %1$s', $search_sql, $object->GetPlainSelectSQL());
 
 			$object->SetSelectSQL($sql);
@@ -1105,13 +1108,16 @@
 	function OnSimpleSearch($event)
 	{
 		$event->redirect = false;
-		$search_table = TABLE_PREFIX.'ses_'.$this->Application->GetSID().'_'.TABLE_PREFIX.'Search';
 
 		$keywords = $this->Application->unescapeRequestVariable(trim($this->Application->GetVar('keywords')));
 
 		$query_object = $this->Application->recallObject('HTTPQuery');
 		/* @var $query_object kHTTPQuery */
 
+		/** @var kSearchHelper $search_helper */
+		$search_helper = $this->Application->recallObject('SearchHelper');
+
+		$search_table = $search_helper->getSearchTable();
 		$sql = 'SHOW TABLES LIKE "'.$search_table.'"';
 
 		if(!isset($query_object->Get['keywords']) &&
@@ -1122,7 +1128,7 @@
 		}
 		if(!$keywords || strlen($keywords) < $this->Application->ConfigValue('Search_MinKeyword_Length'))
 		{
-			$this->Conn->Query('DROP TABLE IF EXISTS '.$search_table);
+			$search_helper->ensureEmptySearchTable();
 			$this->Application->SetVar('keywords_too_short', 1);
 			return; // if no or too short keyword entered, doing nothing
 		}
@@ -1239,10 +1245,7 @@
 			}
 		}
 
-		// keyword string processing
-		$search_helper = $this->Application->recallObject('SearchHelper');
-		/* @var $search_helper kSearchHelper */
-
+		// Keyword string processing.
 		$where_clause = Array ();
 		foreach ($field_list as $field) {
 			if (preg_match('/^' . preg_quote($items_table, '/') . '\.(.*)/', $field, $regs)) {
@@ -1393,9 +1396,12 @@
 		// keep search results from other items after doing a sub-search on current item type
 		$this->Application->SetVar('do_not_drop_search_table', true);
 
-		$ids = Array ();
-		$search_table = TABLE_PREFIX . 'ses_' . $this->Application->GetSID() . '_' . TABLE_PREFIX . 'Search';
+		/** @var kSearchHelper $search_helper */
+		$search_helper = $this->Application->recallObject('SearchHelper');
+
+		$search_table = $search_helper->getSearchTable();
 		$sql = 'SHOW TABLES LIKE "' . $search_table . '"';
+		$ids = array();
 
 		if ( $this->Conn->Query($sql) ) {
 			$item_type = $this->Application->getUnitOption($event->Prefix, 'ItemType');
@@ -1633,9 +1639,11 @@
 		}
 		$where_clause .= ' AND '.$items_table.'.Status = 1';
 
-		// building final search query
-		$search_table = TABLE_PREFIX.'ses_'.$this->Application->GetSID().'_'.TABLE_PREFIX.'Search';
+		/** @var kSearchHelper $search_helper */
+		$search_helper = $this->Application->recallObject('SearchHelper');
 
+		// Building final search query.
+		$search_table = $search_helper->getSearchTable();
 		$this->Conn->Query('DROP TABLE IF EXISTS '.$search_table);
 
 		$id_field = $this->Application->getUnitOption($event->Prefix, 'IDField');
@@ -1654,7 +1662,7 @@
 					GROUP BY '.$items_table.'.'.$id_field.
 					$having_clause;
 
-		$res = $this->Conn->Query($sql);
+		$this->Conn->Query($sql);
 	}
 
 	function getAdvancedSearchCondition($field_name, $record, $keywords, $verbs, &$highlight_keywords)