Index: trunk/core/kernel/utility/http_query.php
===================================================================
diff -u -r2183 -r2310
--- trunk/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 2183)
+++ trunk/core/kernel/utility/http_query.php	(.../http_query.php)	(revision 2310)
@@ -256,7 +256,14 @@
 		if($env_var)
 		{
 			$sid = $this->Get('sid');
-			if (defined('MOD_REWRITE') && MOD_REWRITE && $sid) $env_var = rtrim($sid.$env_var, '/');
+			if (defined('MOD_REWRITE') && MOD_REWRITE && $sid && !$this->Get('admin') )
+			{
+				//$env_var = rtrim($sid.$env_var, '/');
+				$split_by = defined('INPORTAL_ENV') ? '-' : ':';
+				$env_var = explode($split_by, $env_var, 2);
+				$env_var[0] = $sid;
+				$env_var = rtrim( implode($split_by, $env_var), '/');
+			}
 			$env_var = str_replace('\:','_&+$$+&_',$env_var);	// replace escaped "=" with spec-chars :)
 			
 			$parts=explode(':',$env_var);