Index: trunk/core/kernel/application.php
===================================================================
diff -u -r6093 -r6428
--- trunk/core/kernel/application.php	(.../application.php)	(revision 6093)
+++ trunk/core/kernel/application.php	(.../application.php)	(revision 6428)
@@ -201,7 +201,9 @@
 	{
 		if($this->InitDone) return false;
 
-		ob_start(); // collect any output from method (other then tags) into buffer
+		if (!constOn('SKIP_OUT_COMPRESSION')) {
+			ob_start(); // collect any output from method (other then tags) into buffer
+		}
 
 		if(defined('DEBUG_MODE') && $this->isDebugMode() && constOn('DBG_PROFILE_MEMORY')) {
 			$this->Debugger->appendMemoryUsage('Application before Init:');
@@ -646,7 +648,7 @@
 		$this->InitParser();
 		$t = $this->GetVar('t');
 
-		if ($this->isModuleEnabled('In-CMS')) {
+		if ($this->isModuleEnabled('In-Edit')) {
 			$cms_handler =& $this->recallObject('cms_EventHandler');
 			if (!$this->TemplatesCache->TemplateExists($t) && !$this->IsAdmin()) {
 				$t = $cms_handler->GetDesignTemplate();
@@ -1106,6 +1108,7 @@
 		}
 		else
 		{
+			unset($params['pass_category']); // we don't need to pass it when mod_rewrite is off
 			$env = $this->BuildEnv($t, $params, $pass, $pass_events);
 			$ret = $this->BaseURL($prefix, $ssl).$index_file.'?'.$env.$map_link;
 		}
@@ -1223,6 +1226,7 @@
 					$env .= ':'.$this->BuildModuleEnv($pass_element, $params, $pass_events);
 				}
 			}
+			if (!$m_only) $params['pass_category'] = 1;
 			$ret = $this->BuildModuleEnv_NEW('m', $params, $pass_events).$ret;
 			$cat_processed = isset($params['category_processed']) && $params['category_processed'];
 			if ($cat_processed) {
@@ -1327,7 +1331,7 @@
 		$session =& $this->recallObject('Session');
 		$ssl = isset($params['__SSL__']) ? $params['__SSL__'] : 0;
 		$sid = $session->NeedQueryString() && !$this->RewriteURLs($ssl) ? $this->GetSID() : '';
-		if (getArrayValue($params,'admin') == 1) $sid = $this->GetSID();
+//		if (getArrayValue($params,'admin') == 1) $sid = $this->GetSID();
 
 		$ret = '';
 		if ($env_var) {
@@ -1480,7 +1484,11 @@
 		}
 
 		ob_end_flush();
-		$this->Session->SaveData();
+		// session expiration is called from session initialization,
+		// that's why $this->Session may be not defined here
+		if (is_object($this->Session)) {
+			$this->Session->SaveData();
+		}
 		exit;
 	}
 
@@ -2115,7 +2123,7 @@
 	 */
 	function isModuleEnabled($module_name)
 	{
-		return $this->findModule('Name', $module_name);
+		return $this->findModule('Name', $module_name) !== false;
 
 	}