Index: branches/RC/core/units/general/helpers/search_helper.php
===================================================================
diff -u -N -r11711 -r11856
--- branches/RC/core/units/general/helpers/search_helper.php	(.../search_helper.php)	(revision 11711)
+++ branches/RC/core/units/general/helpers/search_helper.php	(.../search_helper.php)	(revision 11856)
@@ -55,7 +55,7 @@
 			foreach ($keywords as $keyword => $sign) {
 				switch ($sign) {
 					case '+':
-						$plus_conditions[] =   implode(' LIKE "%'.$keyword.'%" OR ', $fields).' LIKE "%'.$keyword.'%"';
+						$plus_conditions[] = implode(' LIKE "%'.$keyword.'%" OR ', $fields).' LIKE "%'.$keyword.'%"';
 						break;
 
 					case '-':
@@ -98,7 +98,7 @@
 		 * @param string $field_name
 		 * @return Array
 		 */
-		function getFieldInformation(&$object, $field_name)
+		function _getFieldInformation(&$object, $field_name)
 		{
 			$sql_filter_type = isset($object->VirtualFields[$field_name]) ? 'having' : 'where';
 			$field_type = isset($object->Fields[$field_name]['type']) ? $object->Fields[$field_name]['type'] : 'string';
@@ -119,7 +119,7 @@
 				$table_name = $regs[1].TABLE_PREFIX.'ses_'.EDIT_MARK.'_edit_'.$regs[3]; // edit_mark will be replaced with sid[_main_wid] in AddFilters
 			}
 
-			return Array ('field_name' => $field_name, 'field_type' => $field_type, 'table_name' => $table_name, 'sql_filter_type' => $sql_filter_type);
+			return Array ($field_name, $field_type, $table_name, $sql_filter_type);
 		}
 
 		/**
@@ -218,7 +218,7 @@
 
 			$search_keywords = $this->splitKeyword($search_keyword);
 
-			extract( $this->getFieldInformation($object, $field_name) ); // see getFieldInformation for more details
+			list ($field_name, $field_type, $table_name, $sql_filter_type) = $this->_getFieldInformation($object, $field_name);
 
 			$filter_value = '';
 
@@ -466,7 +466,7 @@
 			if (isset($field_options['grid_options']['sort_field'])) {
 				$field_name = $field_options['grid_options']['sort_field'];
 			}
-			extract( $this->getFieldInformation($object, $field_name) ); // see getFieldInformation for more details
+			list ($field_name, $field_type, $table_name, $sql_filter_type) = $this->_getFieldInformation($object, $field_name);
 
 			$filter_value = '';