Index: branches/5.2.x/core/units/custom_fields/custom_fields_event_handler.php
===================================================================
diff -u -N -r14628 -r14888
--- branches/5.2.x/core/units/custom_fields/custom_fields_event_handler.php	(.../custom_fields_event_handler.php)	(revision 14628)
+++ branches/5.2.x/core/units/custom_fields/custom_fields_event_handler.php	(.../custom_fields_event_handler.php)	(revision 14888)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: custom_fields_event_handler.php 14628 2011-10-04 09:36:30Z alex $
+* @version	$Id: custom_fields_event_handler.php 14888 2011-12-20 10:44:35Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -60,7 +60,7 @@
 			}
 
 			if ($item_type) {
-				$hidden_fields = array_map(Array(&$this->Conn, 'qstr'), $this->_getHiddenFields($event));
+				$hidden_fields = $this->Conn->qstrArray($this->_getHiddenFields($event));
 
 				if ($hidden_fields) {
 					$object->addFilter('hidden_filter', '%1$s.FieldName NOT IN (' . implode(',', $hidden_fields) . ')');
Index: branches/5.2.x/core/install/upgrades.php
===================================================================
diff -u -N -r14856 -r14888
--- branches/5.2.x/core/install/upgrades.php	(.../upgrades.php)	(revision 14856)
+++ branches/5.2.x/core/install/upgrades.php	(.../upgrades.php)	(revision 14888)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: upgrades.php 14856 2011-12-08 17:01:53Z alex $
+* @version	$Id: upgrades.php 14888 2011-12-20 10:44:35Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1718,7 +1718,7 @@
 			);
 
 			$fields = array_keys($profile_mapping);
-			$fields = array_map(Array (&$this->Conn, 'qstr'), $fields);
+			$fields = $this->Conn->qstrArray($fields);
 			$where_clause = 'VariableName IN (' . implode(',', $fields) . ')';
 
 			// 1. get user, that have saved their profile at least once
@@ -1865,7 +1865,7 @@
 					$prefix_special . 'Sort1' . $view_name, $prefix_special . 'Sort1_Dir' . $view_name,
 					$prefix_special . 'Sort2' . $view_name, $prefix_special . 'Sort2_Dir' . $view_name,
 				);
-				$old_variable_names = array_map(Array (&$this->Conn, 'qstr'), $old_variable_names);
+				$old_variable_names = $this->Conn->qstrArray($old_variable_names);
 
 				$sql = 'SELECT VariableValue, VariableName
 						FROM ' . TABLE_PREFIX . 'PersistantSessionData
Index: branches/5.2.x/core/units/helpers/language_import_helper.php
===================================================================
diff -u -N -r14699 -r14888
--- branches/5.2.x/core/units/helpers/language_import_helper.php	(.../language_import_helper.php)	(revision 14699)
+++ branches/5.2.x/core/units/helpers/language_import_helper.php	(.../language_import_helper.php)	(revision 14888)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: language_import_helper.php 14699 2011-10-26 11:39:38Z alex $
+* @version	$Id: language_import_helper.php 14888 2011-12-20 10:44:35Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -236,11 +236,11 @@
 			$phrase_modules = $module_ids;
 			array_push($phrase_modules, ''); // for old language packs without module
 
-			$phrase_modules = array_map(Array (&$this->Conn, 'qstr'), $phrase_modules);
+			$phrase_modules = $this->Conn->qstrArray($phrase_modules);
 
 			// apply phrase selection limit
 			if ($this->_exportLimits['phrases']) {
-				$escaped_phrases = array_map(Array (&$this->Conn, 'qstr'), $this->_exportLimits['phrases']);
+				$escaped_phrases = $this->Conn->qstrArray($this->_exportLimits['phrases']);
 				$limit_where = 'Phrase IN (' . implode(',', $escaped_phrases) . ')';
 			}
 			else {
@@ -258,7 +258,7 @@
 
 			// apply event selection limit
 			if ($this->_exportLimits['emailevents']) {
-				$escaped_email_events = array_map(Array (&$this->Conn, 'qstr'), $this->_exportLimits['emailevents']);
+				$escaped_email_events = $this->Conn->qstrArray($this->_exportLimits['emailevents']);
 				$limit_where = '`Event` IN (' . implode(',', $escaped_email_events) . ')';
 			}
 			else {
@@ -487,7 +487,7 @@
 			$to_insert = array_diff($temp_records, $live_records);
 
 			if ($to_insert) {
-				$to_insert = array_map(Array (&$this->Conn, 'qstr'), $to_insert);
+				$to_insert = $this->Conn->qstrArray($to_insert);
 
 				$sql = 'INSERT INTO ' . $this->Application->getUnitOption($prefix, 'TableName') . '
 						SELECT *
@@ -503,7 +503,7 @@
 			$to_update = array_diff($temp_records, $to_insert);
 
 			if ($to_update) {
-				$to_update = array_map(Array (&$this->Conn, 'qstr'), $to_update);
+				$to_update = $this->Conn->qstrArray($to_update);
 
 				$sql = 'UPDATE ' . $this->Application->getUnitOption($prefix, 'TableName') . ' live
 						SET ';
Index: branches/5.2.x/core/kernel/managers/cache_manager.php
===================================================================
diff -u -N -r14879 -r14888
--- branches/5.2.x/core/kernel/managers/cache_manager.php	(.../cache_manager.php)	(revision 14879)
+++ branches/5.2.x/core/kernel/managers/cache_manager.php	(.../cache_manager.php)	(revision 14888)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: cache_manager.php 14879 2011-12-16 15:07:48Z alex $
+* @version	$Id: cache_manager.php 14888 2011-12-20 10:44:35Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -404,7 +404,7 @@
 			'RunScheduledTasksFromCron',
 		);
 
-		$escaped_config_vars = array_map(Array (&$this->Conn, 'qstr'), $config_vars);
+		$escaped_config_vars = $this->Conn->qstrArray($config_vars);
 
 		$sql = 'SELECT VariableId, VariableName, VariableValue
 				FROM ' . TABLE_PREFIX . 'ConfigurationValues
Index: branches/5.2.x/core/kernel/db/db_load_balancer.php
===================================================================
diff -u -N -r14748 -r14888
--- branches/5.2.x/core/kernel/db/db_load_balancer.php	(.../db_load_balancer.php)	(revision 14748)
+++ branches/5.2.x/core/kernel/db/db_load_balancer.php	(.../db_load_balancer.php)	(revision 14888)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_load_balancer.php 14748 2011-11-09 09:35:48Z alex $
+* @version	$Id: db_load_balancer.php 14888 2011-12-20 10:44:35Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2011 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -561,6 +561,20 @@
 	}
 
 	/**
+	 * Calls "qstr" function for each given array element
+	 *
+	 * @param Array $array
+	 * @param string $function
+	 * @return Array
+	 */
+	public function qstrArray($array, $function = 'qstr')
+	{
+		$conn =& $this->openConnection($this->lastUsedIndex);
+
+		return $conn->qstrArray($array, $function);
+	}
+
+	/**
 	 * Performs insert of given data (useful with small number of queries)
 	 * or stores it to perform multiple insert later (useful with large number of queries)
 	 *
Index: branches/5.2.x/core/units/helpers/search_helper.php
===================================================================
diff -u -N -r14730 -r14888
--- branches/5.2.x/core/units/helpers/search_helper.php	(.../search_helper.php)	(revision 14730)
+++ branches/5.2.x/core/units/helpers/search_helper.php	(.../search_helper.php)	(revision 14888)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: search_helper.php 14730 2011-11-03 11:29:40Z alex $
+* @version	$Id: search_helper.php 14888 2011-12-20 10:44:35Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -630,7 +630,7 @@
 						$multiple = array_key_exists('multiple', $field_options2) && $field_options2['multiple'];
 
 						$field_value = explode('|', substr($field_value, 1, -1));
-						$field_value = array_map(Array (&$this->Conn, 'escape'), $field_value);
+						$field_value = $this->Conn->qstrArray($field_value, 'escape');
 
 						if ($multiple) {
 							$filter_value = $table_name.'`'.$field_name.'` LIKE "%|' . implode('|%" OR ' . $table_name.'`'.$field_name.'` LIKE "%|', $field_value) . '|%"';
Index: branches/5.2.x/core/kernel/db/db_connection.php
===================================================================
diff -u -N -r14845 -r14888
--- branches/5.2.x/core/kernel/db/db_connection.php	(.../db_connection.php)	(revision 14845)
+++ branches/5.2.x/core/kernel/db/db_connection.php	(.../db_connection.php)	(revision 14888)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: db_connection.php 14845 2011-12-08 10:14:28Z alex $
+* @version	$Id: db_connection.php 14888 2011-12-20 10:44:35Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -884,6 +884,18 @@
 		}
 
 		/**
+		 * Calls "qstr" function for each given array element
+		 *
+		 * @param Array $array
+		 * @param string $function
+		 * @return Array
+		 */
+		public function qstrArray($array, $function = 'qstr')
+		{
+			return array_map(Array (&$this, $function), $array);
+		}
+
+		/**
 		 * Escapes strings (only work since PHP 4.3.0)
 		 *
 		 * @param mixed $string