Merge branch 'svg-logo'

2 files changed, 3 insertions, 16 deletions

diff --git a/core/Controller.php b/core/Controller.php
index 3654c661e8..1f4867ae45 100644
--- a/core/Controller.php
+++ b/core/Controller.php
@@ -479,6 +479,8 @@ abstract class Piwik_Controller
 		$view->isCustomLogo = Piwik_Config::getInstance()->branding['use_custom_logo'];
 		$view->logoHeader = Piwik_API_API::getInstance()->getHeaderLogoUrl();
 		$view->logoLarge = Piwik_API_API::getInstance()->getLogoUrl();
+		$view->logoSVG = Piwik_API_API::getInstance()->getSVGLogoUrl();
+		$view->hasSVGLogo = Piwik_API_API::getInstance()->hasSVGLogo();
 
 		$view->enableFrames = Piwik_Config::getInstance()->General['enable_framed_pages']
 			|| @Piwik_Config::getInstance()->General['enable_framed_logins'];
diff --git a/core/View.php b/core/View.php
index 356e30448e..752d0d99e8 100644
--- a/core/View.php
+++ b/core/View.php
@@ -204,21 +204,6 @@ class Piwik_View implements Piwik_View_Interface
 		$view->smarty->clear_compiled_tpl();
 	}
 
-/*
-	public function isCached($template)
-	{
-		if ($this->smarty->is_cached($template))
-		{
-			return true;
-		}
-		return false;
-	}
-	public function setCaching($caching)
-	{
-		$this->smarty->caching = $caching;
-	}
-*/
-	
 	/**
 	 * Render the single report template
 	 *
@@ -232,7 +217,7 @@ class Piwik_View implements Piwik_View_Interface
 		$view = new Piwik_View('CoreHome/templates/single_report.tpl');
 		$view->title = $title;
 		$view->report = $reportHtml;
-		
+
 		if ($fetch)
 		{
 			return $view->render();