From d50f8126949ea22305a4fe4f36b0f4a0e4c3d86e Mon Sep 17 00:00:00 2001
From: Denis Flaven <denis.flaven@combodo.com>
Date: Thu, 28 Jul 2011 15:12:16 +0000
Subject: [PATCH] Fix: broken context usage when no context (neither org nor
 menu) at all

SVN:trunk[1381]
---
 application/itopwebpage.class.inc.php   |  3 ++-
 application/portalwebpage.class.inc.php | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/application/itopwebpage.class.inc.php b/application/itopwebpage.class.inc.php
index 12f490a13..3e6aa818c 100644
--- a/application/itopwebpage.class.inc.php
+++ b/application/itopwebpage.class.inc.php
@@ -398,8 +398,9 @@ EOF
 				{
 					return sURL+'?'+sContext;
 				}				
+				return sURL+'&'+sContext;
 			}
-			return sURL+'&'+sContext;
+			return sURL;
 		}
 		
 		var oUserPreferences = $sUserPrefs;
diff --git a/application/portalwebpage.class.inc.php b/application/portalwebpage.class.inc.php
index 2148b1b40..412c4b7e7 100644
--- a/application/portalwebpage.class.inc.php
+++ b/application/portalwebpage.class.inc.php
@@ -158,8 +158,7 @@ EOF
 	{
 		return '$sAbsURLAppRoot';
 	}
-		
-		
+	
 	function AddAppContext(sURL)
 	{
 		var sContext = '$sAppContext';
@@ -168,11 +167,12 @@ EOF
 			if (sURL.indexOf('?') == -1)
 			{
 				return sURL+'?'+sContext;
-			}
+			}				
+			return sURL+'&'+sContext;
 		}
-		return sURL+'&'+sContext;
+		return sURL;
 	}
-
+	
 	function GoBack(sFormId)
 	{
 		var form = $('#'+sFormId);