Index: branches/5.0.x/core/kernel/utility/http_query.php
===================================================================
diff -u -r12323 -r12368
--- branches/5.0.x/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 12323)
+++ branches/5.0.x/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 12368)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: http_query.php 12323 2009-08-17 20:39:30Z alex $
+* @version	$Id: http_query.php 12368 2009-08-23 21:55:59Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -84,6 +84,13 @@
 	var $Conn;
 
 	/**
+	 * SessionID is given via "sid" variable in query string
+	 *
+	 * @var bool
+	 */
+	var $_sidInQueryString = false;
+
+	/**
 	 * Loads info from $_POST, $_GET and
 	 * related arrays into common place
 	 *
@@ -154,7 +161,17 @@
 			switch ($current) {
 				case 'G':
 					$this->Get = $this->AddVars($_GET);
+					if (array_key_exists('sid', $_GET)) {
+						$this->_sidInQueryString = true;
+					}
+
 					$vars = $this->processQueryString( $this->Get(ENV_VAR_NAME) );
+
+					if (array_key_exists('sid', $vars)) {
+						// used by Session::GetPassedSIDValue
+						$this->Get['sid'] = $vars['sid'];
+					}
+
 					$this->AddParams($vars);
 					break;
 
@@ -566,6 +583,10 @@
 	{
 		$unset_vars = Array (ENV_VAR_NAME, 'rewrite', '_mod_rw_url_', 'Action');
 
+		if (!$this->_sidInQueryString) {
+			$unset_vars[] = 'sid';
+		}
+
 		$ret = $this->Get;
 		foreach ($unset_vars as $var_name) {
 			if( isset($ret[$var_name]) ) {