[Piwik-svn] r400 - in trunk: modules/SmartyPlugins plugins/Installation

[svnmaster at piwik.org]

Author: matt
Date: 2008-03-22 02:08:44 +0100 (Sat, 22 Mar 2008)
New Revision: 400

Modified:
   trunk/modules/SmartyPlugins/function.url.php
   trunk/plugins/Installation/Controller.php
Log:
- fixed bugs sent by Yvan Taviaud

Modified: trunk/modules/SmartyPlugins/function.url.php
===================================================================
--- trunk/modules/SmartyPlugins/function.url.php	2008-03-22 00:56:18 UTC (rev 399)
+++ trunk/modules/SmartyPlugins/function.url.php	2008-03-22 01:08:44 UTC (rev 400)
@@ -27,5 +27,5 @@
  */
 function smarty_function_url($params, &$smarty)
 {
-	return Piwik_Url::getCurrentQueryStringWithParametersModified( $params );
+	return Piwik_Url::getCurrentScriptName() . Piwik_Url::getCurrentQueryStringWithParametersModified( $params );
 }

Modified: trunk/plugins/Installation/Controller.php
===================================================================
--- trunk/plugins/Installation/Controller.php	2008-03-22 00:56:18 UTC (rev 399)
+++ trunk/plugins/Installation/Controller.php	2008-03-22 01:08:44 UTC (rev 400)
@@ -301,7 +301,7 @@
 		}
 		
 		
-		$view->websiteName = $_SESSION['site_name'];
+		$view->websiteName = urldecode($_SESSION['site_name']);
 		
 		$jsTag = Piwik::getJavascriptCode($_SESSION['site_idSite'], Piwik_Url::getCurrentUrlWithoutFileName());