Index: trunk/kernel/admin_templates/incs/header.tpl
===================================================================
diff -u -N -r4225 -r4325
--- trunk/kernel/admin_templates/incs/header.tpl	(.../header.tpl)	(revision 4225)
+++ trunk/kernel/admin_templates/incs/header.tpl	(.../header.tpl)	(revision 4325)
@@ -44,8 +44,8 @@
 <inp2:m_endif/>
 
 <inp2:m_ParseBlock name="kernel_form"/>
-<inp2:m_if prefix="m" function="IsDebugMode"/>
-<a href="javascript:self.location.reload()">Reload frame</a>&nbsp;||&nbsp;<a href="javascript:toggleDebugLayer()">Show debugger</a>
-<inp2:m_endif/>
+<inp2:m_if check="m_IsDebugMode">
+<input type="button" class="button" value="Reload Frame" onclick="self.location.reload();" />&nbsp;&nbsp;<input type="button" class="button" value="Show Debugger" onclick="toggleDebugLayer();" />
+</inp2:m_if>
 
 <inp2:m_StoreSystemVars />
\ No newline at end of file
Index: trunk/admin/install/langpacks/english.lang
===================================================================
diff -u -N -r4298 -r4325
--- trunk/admin/install/langpacks/english.lang	(.../english.lang)	(revision 4298)
+++ trunk/admin/install/langpacks/english.lang	(.../english.lang)	(revision 4325)
@@ -5,6 +5,7 @@
 			<PHRASE Label="la_Active" Module="In-Portal" Type="1">QWN0aXZl</PHRASE>
 			<PHRASE Label="la_added" Module="In-Portal" Type="1">QWRkZWQ=</PHRASE>
 			<PHRASE Label="la_AddTo" Module="In-Portal" Type="1">QWRkIFRv</PHRASE>
+			<PHRASE Label="la_and" Module="In-Portal" Type="1">YW5k</PHRASE>
 			<PHRASE Label="la_approve_description" Module="In-Portal" Type="1">QWN0aXZl</PHRASE>
 			<PHRASE Label="la_Article_Author" Module="In-Portal" Type="1">QXV0aG9y</PHRASE>
 			<PHRASE Label="la_Article_Date" Module="In-Portal" Type="1">RGF0ZQ==</PHRASE>
@@ -2168,7 +2169,7 @@
 			<EVENT MessageType="text" Event="CATEGORY.DENY" Type="1">WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBkZW5pZWQKCkEgY2F0ZWdvcnkgIjxpbnA6bV9jYXRlZ29yeV9maWVsZCBfRmllbGQ9Ik5hbWUiIF9TdHJpcEhUTUw9IjEiLz4iIGhhcyBiZWVuIGRlbmllZC4=</EVENT>
 			<EVENT MessageType="text" Event="CATEGORY.MODIFY" Type="0">WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBtb2RpZmllZAoKWW91ciBzdWdnZXN0ZWQgY2F0ZWdvcnkgIjxpbnA6bV9jYXRlZ29yeV9maWVsZCBfRmllbGQ9Ik5hbWUiIF9TdHJpcEhUTUw9IjEiLz4iIGhhcyBiZWVuIG1vZGlmaWVkLg==</EVENT>
 			<EVENT MessageType="text" Event="CATEGORY.MODIFY" Type="1">WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogQSBjYXRlZ29yeSBoYXMgYmVlbiBtb2RpZmllZAoKQSBjYXRlZ29yeSAiPGlucDptX2NhdGVnb3J5X2ZpZWxkIF9GaWVsZD0iTmFtZSIgX1N0cmlwSFRNTD0iMSIvPiIgaGFzIGJlZW4gbW9kaWZpZWQu</EVENT>
-			<EVENT MessageType="text" Event="COMMON.FOOTER" Type="1">WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IENvbW1vbiBGb290ZXIgVGVtcGxhdGUKCi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCg0KQmVzdCBSZWdhcmRzDQpieSBJbi1Qb3J0YWw=</EVENT>
+			<EVENT MessageType="html" Event="COMMON.FOOTER" Type="1">WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IENvbW1vbiBGb290ZXIgVGVtcGxhdGUKCjxiciAvPi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS08YnIgLz48YnIgLz5CZXN0IFJlZ2FyZHM8YnIgLz5ieSBJbi1Qb3J0YWw8YnIgLz4=</EVENT>
 			<EVENT MessageType="text" Event="USER.ADD" Type="0">WC1Qcmlvcml0eTogMQ0KWC1NU01haWwtUHJpb3JpdHk6IEhpZ2gNClgtTWFpbGVyOiBJbi1Qb3J0YWwKU3ViamVjdDogSW4tcG9ydGFsIHJlZ2lzdHJhdGlvbgoKRGVhciA8aW5wOnRvdXNlciBfRmllbGQ9IkZpcnN0TmFtZSIgLz4gPGlucDp0b3VzZXIgX0ZpZWxkPSJMYXN0TmFtZSIgLz4sDQoNClRoYW5rIHlvdSBmb3IgcmVnaXN0ZXJpbmcgb24gPGlucDptX3BhZ2VfdGl0bGUgLz4uIFlvdXIgcmVnaXN0cmF0aW9uIGlzIG5vdyBhY3RpdmUu</EVENT>
 			<EVENT MessageType="text" Event="USER.ADD" Type="1">WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IE5ldyB1c2VyIGhhcyBiZWVuIGFkZGVkCgpBIG5ldyB1c2VyICI8aW5wOnRvdXNlciBfRmllbGQ9IkxvZ2luIiAvPiIgaGFzIGJlZW4gYWRkZWQu</EVENT>
 			<EVENT MessageType="text" Event="USER.ADD.PENDING" Type="0">WC1Qcmlvcml0eTogMQpYLU1TTWFpbC1Qcmlvcml0eTogSGlnaApYLU1haWxlcjogSW4tUG9ydGFsClN1YmplY3Q6IEluLVBvcnRhbCBSZWdpc3RyYXRpb24KCkRlYXIgPGlucDp0b3VzZXIgX0ZpZWxkPSJGaXJzdE5hbWUiIC8+IDxpbnA6dG91c2VyIF9GaWVsZD0iTGFzdE5hbWUiIC8+LA0KDQpUaGFuayB5b3UgZm9yIHJlZ2lzdGVyaW5nIG9uIDxpbnA6bV9wYWdlX3RpdGxlIC8+LiBZb3VyIHJlZ2lzdHJhdGlvbiB3aWxsIGJlIGFjdGl2ZSBhZnRlciBhcHByb3ZhbC4=</EVENT>
Index: trunk/core/kernel/db/db_event_handler.php
===================================================================
diff -u -N -r4320 -r4325
--- trunk/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 4320)
+++ trunk/core/kernel/db/db_event_handler.php	(.../db_event_handler.php)	(revision 4325)
@@ -104,6 +104,7 @@
 		 * id passed in get/post as prefix_id
 		 *
 		 * @param kEvent $event
+		 * @return Array ids stored
 		 */
 		function StoreSelectedIDs(&$event)
 		{
@@ -138,16 +139,12 @@
 			// This is critical - otherwise getPassedID will return last ID stored in session! (not exactly true)
 			// this smells... needs to be refactored
 			$first_id = getArrayValue($ret,0);
-			if($first_id === false)
-			{
-				/*if ($event->getPrefixSpecial() == 'lang.current ')
-				{
-					$this->Application->Debugger->appendTrace();
-				}*/
-
+			if ($first_id === false) {
 				trigger_error('Requested ID for prefix <b>'.$event->getPrefixSpecial().'</b> <span class="debug_error">not passed</span>',E_USER_NOTICE);
 			}
+			
 			$this->Application->SetVar($event->getPrefixSpecial(true).'_id', $first_id);
+			return $ret;
 		}
 
 		/**
Index: trunk/core/kernel/utility/unit_config_reader.php
===================================================================
diff -u -N -r4309 -r4325
--- trunk/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 4309)
+++ trunk/core/kernel/utility/unit_config_reader.php	(.../unit_config_reader.php)	(revision 4325)
@@ -192,7 +192,7 @@
 
 				if($config_found && isset($config) && $config)
 				{
-					$prefix = $config['Prefix'];
+					$prefix = isset($config['Prefix']) ? $config['Prefix'] : '';
 
 					preg_match('/\/(.*)\//U', $filename, $rets);
 					$config['ModuleFolder'] = $rets[1];
Index: trunk/core/kernel/processors/main_processor.php
===================================================================
diff -u -N -r4303 -r4325
--- trunk/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 4303)
+++ trunk/core/kernel/processors/main_processor.php	(.../main_processor.php)	(revision 4325)
@@ -506,7 +506,7 @@
 		if ( !$BlockParser->DataExists && (isset($params['data_exists']) || isset($params['block_no_data'])) ) {
 			if ($block_no_data = getArrayValue($params, 'block_no_data')) {
 				$res = $BlockParser->Parse(
-					$templates_cache->GetTemplateBody($block_no_data, $silent),
+					$templates_cache->GetTemplateBody($block_no_data, getArrayValue($params, 'is_silent') ),
 					$t
 				);
 			}
@@ -519,6 +519,20 @@
 		return $res;
 	}
 
+	function ModuleInclude($params)
+	{
+		$ret = '';
+		$block_params = Array('is_silent' => 1); // don't make fatal errors in case if template is missing
+		foreach ($this->Application->ModuleInfo as $module_name => $module_data) {
+			if (!$module_data['Loaded']) continue;
+			$module_key = strtolower($module_name);
+			$block_params['t'] = $this->SelectParam($params, $module_key.'_template,'.$module_key.'_t,t');
+			$block_params['block_no_data'] = $this->SelectParam($params, $module_key.'_block_no_data,block_no_data');
+			$ret .= $this->MyInclude($block_params);
+		}
+		return $ret;
+	}
+	
 	/*function Kernel_Scripts($params)
 	{
 		return '<script type="text/javascript" src="'.PROTOCOL.SERVER_NAME.BASE_PATH.'/kernel3/js/grid.js"></script>';
Index: trunk/kernel/action.php
===================================================================
diff -u -N -r4243 -r4325
--- trunk/kernel/action.php	(.../action.php)	(revision 4243)
+++ trunk/kernel/action.php	(.../action.php)	(revision 4325)
@@ -4,16 +4,17 @@
 
 // ====== Debugger related: begin ======
 $script = basename($_SERVER['PHP_SELF']);
-$skipDebug = Array('index.php','tree.php','head.php','credits.php');
+$skipDebug = Array('index.php', 'tree.php', 'head.php', 'credits.php');
 if( admin_login() && !in_array($script, $skipDebug) )
 {
 	if( IsDebugMode() )
 	{
 		if($Action) $debugger->setHTMLByIndex(1,'Kernel Action: <b>'.$Action.'</b>','append');
-		if(!(defined('REDIRECT_REQUIRED')&&REDIRECT_REQUIRED))
-		{
-			echo '<a href="javascript:self.location.reload();">Reload Frame</a>';
-			if( defined('DBG_ZEND_PRESENT')&&DBG_ZEND_PRESENT==0 ) echo ' || <a href="javascript:toggleDebugLayer();">Show Debugger</a><br>';
+		if (!constOn('REDIRECT_REQUIRED')) {
+			echo '<input type="button" class="button" value="Reload Frame" onclick="self.location.reload();" />';
+			if (!constOn('DBG_ZEND_PRESENT')) {
+				echo '&nbsp;&nbsp;<input type="button" class="button" value="Show Debugger" onclick="toggleDebugLayer();" /><br />';
+			}
 		}
 	}
 }