From 0e7297087b54d991b87b5a41cb2d45a6e8ede803 Mon Sep 17 00:00:00 2001
From: Denis Flaven <denis.flaven@combodo.com>
Date: Tue, 19 Jan 2010 12:39:28 +0000
Subject: [PATCH] - Don't loose the current context (current Org) - When
 switching Org, reload the current pages

SVN:trunk[285]
---
 application/itopwebpage.class.inc.php | 2 +-
 application/template.class.inc.php    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/itopwebpage.class.inc.php b/application/itopwebpage.class.inc.php
index 07ffba979..f89976d07 100644
--- a/application/itopwebpage.class.inc.php
+++ b/application/itopwebpage.class.inc.php
@@ -135,7 +135,7 @@ EOF
     {
         // Combo box to select the organization
 		$this->AddToMenu("<div id=\"OrganizationSelection\">
-			  <form style=\"display:inline\" action=\"./UI.php\"><select style=\"width:150px;font-size:x-small\" name=\"org_id\" title=\"Pick an organization\" onChange=\"this.form.submit();\">\n");
+			  <form style=\"display:inline\" action=\"{$_SERVER['PHP_SELF']}\"><select style=\"width:150px;font-size:x-small\" name=\"org_id\" title=\"Pick an organization\" onChange=\"this.form.submit();\">\n");
 		// List of visible Organizations
 		$oContext = new UserContext();
 		$oSearchFilter = $oContext->NewFilter("bizOrganization");
diff --git a/application/template.class.inc.php b/application/template.class.inc.php
index 807ffdf30..6d13ff67a 100644
--- a/application/template.class.inc.php
+++ b/application/template.class.inc.php
@@ -34,7 +34,7 @@ class DisplayTemplate
 				$oBlock = DisplayBlock::FromTemplate($sOuterTag);
 				if (is_object($oBlock))
 				{
-					$oBlock->Display($oPage, 'block_'.self::$iBlockCount);
+					$oBlock->Display($oPage, 'block_'.self::$iBlockCount, $aParams);
 				}
 				self::$iBlockCount++;
 			}