Use accessors when rendering Views so UIControl is a bit cleaner.

2 files changed, 1 insertions, 6 deletions

diff --git a/core/View.php b/core/View.php
index c3f45c65c1..572575c66c 100644
--- a/core/View.php
+++ b/core/View.php
@@ -249,7 +249,7 @@ class View implements ViewInterface
 
     protected function renderTwigTemplate()
     {
-        $output = $this->twig->render($this->template, $this->templateVars);
+        $output = $this->twig->render($this->getTemplateFile(), $this->getTemplateVars());
         $output = $this->applyFilter_cacheBuster($output);
 
         $helper = new Theme;
diff --git a/core/View/UIControl.php b/core/View/UIControl.php
index 111ef58133..d29ec6655c 100644
--- a/core/View/UIControl.php
+++ b/core/View/UIControl.php
@@ -104,7 +104,6 @@ class UIControl extends \Piwik\View
             throw new Exception("All UIControls must set a jsClass property");
         }
 
-        $this->getTemplateVars();
         return parent::render();
     }
 
@@ -132,10 +131,6 @@ class UIControl extends \Piwik\View
             $this->templateVars['clientSideParameters'][$name] = $innerTemplateVars[$name];
         }
 
-        if ($this instanceof \Piwik\Plugins\SegmentEditor\SegmentSelectorControl) {
-            \Piwik\Log::warning(print_r($override, true));
-        }
-
         return parent::getTemplateVars($override);
     }