- fixed bugs sent by Yvan Taviaud

2 files changed, 2 insertions, 2 deletions

diff --git a/modules/SmartyPlugins/function.url.php b/modules/SmartyPlugins/function.url.php
index 73094f2a41..5e771c6376 100644
--- a/modules/SmartyPlugins/function.url.php
+++ b/modules/SmartyPlugins/function.url.php
@@ -27,5 +27,5 @@ require_once "Url.php";
  */
 function smarty_function_url($params, &$smarty)
 {
-	return Piwik_Url::getCurrentQueryStringWithParametersModified( $params );
+	return Piwik_Url::getCurrentScriptName() . Piwik_Url::getCurrentQueryStringWithParametersModified( $params );
 }
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index 0fa6b71202..f56efbbeb9 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -301,7 +301,7 @@ class Piwik_Installation_Controller extends Piwik_Controller
 		}
 		
 		
-		$view->websiteName = $_SESSION['site_name'];
+		$view->websiteName = urldecode($_SESSION['site_name']);
 		

 		$jsTag = Piwik::getJavascriptCode($_SESSION['site_idSite'], Piwik_Url::getCurrentUrlWithoutFileName());