- fixing dashboard when using multiple site

git-svn-id: http://dev.piwik.org/svn/trunk@548 59fd770c-687e-43c8-a1e3-f5a4ff64c105

2 files changed, 3 insertions, 8 deletions

diff --git a/plugins/Dashboard/Controller.php b/plugins/Dashboard/Controller.php
index 3f9cd1a6ad..f87c5339a5 100644
--- a/plugins/Dashboard/Controller.php
+++ b/plugins/Dashboard/Controller.php
@@ -130,12 +130,10 @@ class Piwik_Dashboard_Controller extends Piwik_Controller
 	//in a 'master' controller for statistics (tracs #91)
 	protected function setGeneralVariablesView($view)
 	{
-		// date
 		$view->date = $this->strDate;
 		$oDate = new Piwik_Date($this->strDate);
 		$view->prettyDate = $oDate->get("l jS F Y");
 		
-		// period
 		$currentPeriod = Piwik_Common::getRequestVar('period');
 		$otherPeriodsAvailable = array('day','week','month','year');
 		
@@ -147,10 +145,7 @@ class Piwik_Dashboard_Controller extends Piwik_Controller
 		
 		$view->period = $currentPeriod;
 		$view->otherPeriods = $otherPeriodsAvailable;
-		
-		// other
 		$view->idSite = Piwik_Common::getRequestVar('idSite');
-		
 		$view->userLogin = Piwik::getCurrentUserLogin();
 		$view->sites = Piwik_SitesManager_API::getSitesWithAtLeastViewAccess();
 		$view->url = Piwik_Url::getCurrentUrl();
diff --git a/plugins/Dashboard/templates/index.tpl b/plugins/Dashboard/templates/index.tpl
index 7107947da3..db8a55b3a7 100644
--- a/plugins/Dashboard/templates/index.tpl
+++ b/plugins/Dashboard/templates/index.tpl
@@ -12,9 +12,9 @@
 	{/if}

 	

 	piwik.availableWidgets = {$availableWidgets};

-	piwik.idSite = {$idSite};

-	piwik.period = "{$period}";

-	piwik.currentDateStr = "{$date}";

+	piwik.idSite = decodeURIComponent("{$idSite}");

+	piwik.period = decodeURIComponent("{$period}");

+	piwik.currentDateStr = decodeURIComponent("{$date}");

 </script>

 

 <script type="text/javascript" src="plugins/Dashboard/templates/Dashboard.js"></script>