Index: branches/5.0.x/core/kernel/utility/http_query.php
===================================================================
diff -u -r12299 -r12323
--- branches/5.0.x/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 12299)
+++ branches/5.0.x/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 12323)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: http_query.php 12299 2009-08-17 01:51:27Z dmitrya $
+* @version	$Id: http_query.php 12323 2009-08-17 20:39:30Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -223,15 +223,13 @@
 //		$this->convertPostEvents();
 		//		if ($this->Application->RewriteURLs()) {
 		if ($this->Application->RewriteURLs() || $this->Get('_mod_rw_url_')) {
-			if( $this->Application->isDebugMode() )
-			{
+			if (defined('DEBUG_MODE') && $this->Application->isDebugMode()) {
 				$this->Application->Debugger->profileStart('url_parsing');
 				$this->processRewriteURL();
 				$description = 'Parsing <b>MOD_REWRITE</b> url (template: <b>'.$this->Get('t').'</b>)';
 				$this->Application->Debugger->profileFinish('url_parsing', $description);
 			}
-			else
-			{
+			else {
 				$this->processRewriteURL();
 			}
 		}
@@ -377,26 +375,19 @@
 	function extractSIDAndTemplate(&$parts)
 	{
 		$vars = Array ();
-		if (defined('INPORTAL_ENV') && INPORTAL_ENV) { // SID-TEMPLATE
-			$sub_parts = array_shift($parts);
-			list($sid, $t) = explode('-', $sub_parts, 2);
+		$sub_parts = array_shift($parts);
 
+		list ($sid, $t) = explode('-', $sub_parts, 2);
+
+		if ($sid) {
 			// Save Session ID
-			if ($sid) {
-				$this->Set('sid', $sid);
-				$vars['sid'] = $sid;
-			}
+			$this->Set('sid', $sid);
+			$vars['sid'] = $sid;
 		}
-		else { // SID:TEMPLATE
-			// Save Session ID
-			$sid = array_shift($parts);
-			if ($sid) $vars['sid'] = $sid;
 
-			$t = array_shift($parts);
-		}
-
 		// Save Template Name
 		$vars['t'] = $this->getDefaultTemplate($t);
+
 		return $vars;
 	}