- Don't loose the current context (current Org)

- When switching Org, reload the current pages

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@285 a333f486-631f-4898-b8df-5754b55c2be0

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");

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++;
 			}