Index: branches/5.1.x/core/kernel/utility/debugger.php
===================================================================
diff -u -N -r13956 -r13989
--- branches/5.1.x/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 13956)
+++ branches/5.1.x/core/kernel/utility/debugger.php	(.../debugger.php)	(revision 13989)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: debugger.php 13956 2010-09-22 10:16:03Z alex $
+* @version	$Id: debugger.php 13989 2010-10-19 09:01:22Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1222,7 +1222,7 @@
 						$Debugger.DOMViewerURL = '<?php echo constant('DBG_DOMVIEWER'); ?>';
 						$Debugger.EditorPath = '<?php echo defined('DBG_EDITOR') ? addslashes(DBG_EDITOR) : '' ?>';
 						$Debugger.DebugURL = '<?php echo $this->baseURL.'/debugger_responce.php?sid='.$this->rowSeparator.'&path='.urlencode($dbg_path); ?>';
-						$Debugger.EventURL = '<?php echo is_object($application->Factory) ? $application->HREF('dummy', '', Array ('pass' => 'm')) : ''; ?>';
+						$Debugger.EventURL = '<?php echo is_object($application->Factory) ? $application->HREF('dummy', '', Array ('pass' => 'm', '__NO_REWRITE__' => 1)) : ''; ?>';
 						<?php
 							if ($this->IsFatalError || (DBG_RAISE_ON_WARNINGS && $this->WarningCount)) {
 								echo '$Debugger.Toggle();';
Index: branches/5.1.x/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -N -r13962 -r13989
--- branches/5.1.x/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 13962)
+++ branches/5.1.x/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 13989)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: unit_config_reader.php 13962 2010-09-25 18:38:45Z alex $
+* @version	$Id: unit_config_reader.php 13989 2010-10-19 09:01:22Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -441,7 +441,9 @@
 		$this->ParseConfigs();
 		$this->AfterConfigRead(false);
 		$this->processDynamicClones();
-		$this->retrieveCollections();
+
+		// don't call kUnitConfigReader::retrieveCollections since it
+		// will overwrite what we already have in kApplication class instance
 	}
 
 	/**
Index: branches/5.1.x/core/units/site_domains/site_domain_eh.php
===================================================================
diff -u -N -r13874 -r13989
--- branches/5.1.x/core/units/site_domains/site_domain_eh.php	(.../site_domain_eh.php)	(revision 13874)
+++ branches/5.1.x/core/units/site_domains/site_domain_eh.php	(.../site_domain_eh.php)	(revision 13989)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: site_domain_eh.php 13874 2010-08-28 20:39:56Z alex $
+* @version	$Id: site_domain_eh.php 13989 2010-10-19 09:01:22Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2010 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -17,18 +17,19 @@
 	class SiteDomainEventHandler extends kDBEventHandler {
 
 		/**
-		 * Allows to override standart permission mapping
+		 * Permission check override
 		 *
+		 * @param kEvent $event
 		 */
-		function mapPermissions()
+		function CheckPermission(&$event)
 		{
-			parent::mapPermissions();
+			if ($event->Name == 'OnItemBuild') {
+				// check permission without using $event->getSection(),
+				// so first cache rebuild won't lead to "ldefault_Name" field being used
+				return true;
+			}
 
-			$permissions = Array (
-				'OnItemBuild' => Array ('self' => true),
-			);
-
-			$this->permMapping = array_merge($this->permMapping, $permissions);
+			return parent::CheckPermission($event);
 		}
 
 		/**