diff options
author | matt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2008-03-22 04:08:44 +0300 |
---|---|---|
committer | matt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2008-03-22 04:08:44 +0300 |
commit | 6833762c812d751930c7e2c806bbf53431c5598e (patch) | |
tree | 724c647bc9329a305039f04c122f1c91e9231d29 | |
parent | 21e08a23a71e3e7b5bce0c54a8de5b45574cebc5 (diff) |
- fixed bugs sent by Yvan Taviaud
-rw-r--r-- | modules/SmartyPlugins/function.url.php | 2 | ||||
-rw-r--r-- | plugins/Installation/Controller.php | 2 |
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());
|