Index: branches/5.1.x/core/kernel/application.php
===================================================================
diff -u -N -r14241 -r14326
--- branches/5.1.x/core/kernel/application.php	(.../application.php)	(revision 14241)
+++ branches/5.1.x/core/kernel/application.php	(.../application.php)	(revision 14326)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: application.php 14241 2011-03-16 20:24:35Z alex $
+* @version	$Id: application.php 14326 2011-05-20 08:13:02Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -228,6 +228,16 @@
 	var $siteDomain = null;
 
 	/**
+	 * Cache storage
+	 *
+	 * @var Array
+	 */
+	var $Caches = Array (
+		'PhraseList' => '',
+		'ConfigVariables' => Array (),
+	);
+
+	/**
 	* Returns kApplication instance anywhere in the script.
  	*
  	* This method should be used to get single kApplication object instance anywhere in the
@@ -1029,7 +1039,7 @@
 
 			if ($this->GetVar('ajax') == 'yes' && !$this->GetVar('debug_ajax')) {
 				// hide debug output from ajax requests automatically
-				define('DBG_SKIP_REPORTING', 1);
+				safeDefine('DBG_SKIP_REPORTING', 1); // safeDefine, because debugger also defines it
 			}
 		}
 		elseif ($this->GetVar('admin')) {
Index: branches/5.1.x/core/units/helpers/csv_helper.php
===================================================================
diff -u -N -r14241 -r14326
--- branches/5.1.x/core/units/helpers/csv_helper.php	(.../csv_helper.php)	(revision 14241)
+++ branches/5.1.x/core/units/helpers/csv_helper.php	(.../csv_helper.php)	(revision 14326)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: csv_helper.php 14241 2011-03-16 20:24:35Z alex $
+* @version	$Id: csv_helper.php 14326 2011-05-20 08:13:02Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -65,7 +65,7 @@
 
 			$file = fopen($export_data['file_name'], $first_step ? 'w' : 'a');
 
-			$prefix_elems = split('\.|_', $export_data['prefix']);
+			$prefix_elems = preg_split('/\.|_/', $export_data['prefix'], 2);
 			$grids = $this->Application->getUnitOption($prefix_elems[0], 'Grids');
 			$grid_config = $grids[ $export_data['grid'] ]['Fields'];
 
@@ -219,7 +219,7 @@
 			$headers = fgetcsv($file, 8192, $import_data['delimiter'], $import_data['enclosure']);
 			fclose($file);
 
-			$prefix_elems = split('\.|_', $import_data['prefix']);
+			$prefix_elems = preg_split('/\.|_/', $import_data['prefix'], 2);
 			$grids = $this->Application->getUnitOption($prefix_elems[0], 'Grids');
 			$grid_config = $grids[ $import_data['grid'] ]['Fields'];
 
@@ -267,7 +267,7 @@
 		function ImportStep()
 		{
 			$import_data = unserialize($this->Application->RecallVar('import_data'));
-			$prefix_elems = split('\.|_', $import_data['prefix']);
+			$prefix_elems = preg_split('/\.|_/', $import_data['prefix'], 2);
 
 			$object =& $this->Application->recallObject($prefix_elems[0].'.-csvimport', $prefix_elems[0], Array('skip_autoload' => true, 'populate_ml_fields' => true));
 			/* @var $object kDBItem */
Index: branches/5.1.x/core/units/admin/admin_events_handler.php
===================================================================
diff -u -N -r14241 -r14326
--- branches/5.1.x/core/units/admin/admin_events_handler.php	(.../admin_events_handler.php)	(revision 14241)
+++ branches/5.1.x/core/units/admin/admin_events_handler.php	(.../admin_events_handler.php)	(revision 14326)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: admin_events_handler.php 14241 2011-03-16 20:24:35Z alex $
+* @version	$Id: admin_events_handler.php 14326 2011-05-20 08:13:02Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -489,7 +489,7 @@
 		if(!$prefix_special) {
 			$prefix_special = $export_helper->ExportData('prefix');
 		}
-		$prefix_elems = split('\.|_', $prefix_special, 2);
+		$prefix_elems = preg_split('/\.|_/', $prefix_special, 2);
 		$perm_sections = $this->Application->getUnitOption($prefix_elems[0], 'PermSection');
 
 		if(!$this->Application->CheckPermission($perm_sections['main'].'.view')) {
@@ -514,7 +514,7 @@
 		/* @var $export_helper kCSVHelper */
 
 		$prefix_special = $export_helper->ExportData('prefix');
-		$prefix_elems = split('\.|_', $prefix_special, 2);
+		$prefix_elems = preg_split('/\.|_/', $prefix_special, 2);
 		$perm_sections = $this->Application->getUnitOption($prefix_elems[0], 'PermSection');
 
 		if(!$this->Application->CheckPermission($perm_sections['main'].'.view')) {
@@ -533,7 +533,7 @@
 	function OnCSVImportBegin(&$event)
 	{
 		$prefix_special = $this->Application->GetVar('PrefixSpecial');
-		$prefix_elems = split('\.|_', $prefix_special, 2);
+		$prefix_elems = preg_split('/\.|_/', $prefix_special, 2);
 		$perm_sections = $this->Application->getUnitOption($prefix_elems[0], 'PermSection');
 
 		if(!$this->Application->CheckPermission($perm_sections['main'].'.add') && !$this->Application->CheckPermission($perm_sections['main'].'.edit')) {
@@ -579,7 +579,7 @@
 		/* @var $export_helper kCSVHelper */
 
 		$prefix_special = $import_helper->ImportData('prefix');
-		$prefix_elems = split('\.|_', $prefix_special, 2);
+		$prefix_elems = preg_split('/\.|_/', $prefix_special, 2);
 		$perm_sections = $this->Application->getUnitOption($prefix_elems[0], 'PermSection');
 		if(!$this->Application->CheckPermission($perm_sections['main'].'.add') && !$this->Application->CheckPermission($perm_sections['main'].'.edit')) {
 			$event->status = erPERM_FAIL;