getting rid of the fetch parameter

1 files changed, 22 insertions, 24 deletions

diff --git a/plugins/Live/Controller.php b/plugins/Live/Controller.php
index d89a8c549d..48c5ce49e8 100644
--- a/plugins/Live/Controller.php
+++ b/plugins/Live/Controller.php
@@ -27,12 +27,12 @@ class Controller extends \Piwik\Plugin\Controller
 {
     const SIMPLE_VISIT_COUNT_WIDGET_LAST_MINUTES_CONFIG_KEY = 'live_widget_visitor_count_last_minutes';
 
-    function index($fetch = false)
+    function index()
     {
-        return $this->widget($fetch);
+        return $this->widget();
     }
 
-    public function widget($fetch = false)
+    public function widget()
     {
         $view = new View('@Live/index');
         $view->idSite = $this->idSite;
@@ -40,10 +40,10 @@ class Controller extends \Piwik\Plugin\Controller
         $view->liveRefreshAfterMs = (int)Config::getInstance()->General['live_widget_refresh_after_seconds'] * 1000;
         $view->visitors = $this->getLastVisitsStart($fetchPlease = true);
         $view->liveTokenAuth = Piwik::getCurrentUserTokenAuth();
-        return $this->render($view, $fetch);
+        return $this->render($view);
     }
 
-    public function getSimpleLastVisitCount($fetch = false)
+    public function getSimpleLastVisitCount()
     {
         $lastMinutes = Config::getInstance()->General[self::SIMPLE_VISIT_COUNT_WIDGET_LAST_MINUTES_CONFIG_KEY];
 
@@ -65,48 +65,46 @@ class Controller extends \Piwik\Plugin\Controller
             'one_minute'  => Piwik::translate('General_OneMinute'),
             'minutes'     => Piwik::translate('General_NMinutes')
         );
-        return $this->render($view, $fetch);
+        return $this->render($view);
     }
 
-    public function ajaxTotalVisitors($fetch = false)
+    public function ajaxTotalVisitors()
     {
         $view = new View('@Live/ajaxTotalVisitors');
         $view = $this->setCounters($view);
         $view->idSite = $this->idSite;
-        return $this->render($view, $fetch);
+        return $this->render($view);
     }
 
-    private function render(View $view, $fetch)
+    private function render(View $view)
     {
         $rendered = $view->render();
-        if ($fetch) {
-            return $rendered;
-        }
-        echo $rendered;
+
+        return $rendered;
     }
 
     public function indexVisitorLog()
     {
         $view = new View('@Live/indexVisitorLog.twig');
         $view->filterEcommerce = Common::getRequestVar('filterEcommerce', 0, 'int');
-        $view->visitorLog = $this->getLastVisitsDetails($fetch = true);
-        echo $view->render();
+        $view->visitorLog = $this->getLastVisitsDetails();
+        return $view->render();
     }
 
-    public function getLastVisitsDetails($fetch = false)
+    public function getLastVisitsDetails()
     {
-        return $this->renderReport(__FUNCTION__, $fetch);
+        return $this->renderReport(__FUNCTION__);
     }
 
     /**
      * @deprecated
      */
-    public function getVisitorLog($fetch = false)
+    public function getVisitorLog()
     {
-        return $this->getLastVisitsDetails($fetch);
+        return $this->getLastVisitsDetails();
     }
 
-    public function getLastVisitsStart($fetch = false)
+    public function getLastVisitsStart()
     {
         // hack, ensure we load today's visits by default
         $_GET['date'] = 'today';
@@ -118,7 +116,7 @@ class Controller extends \Piwik\Plugin\Controller
         $visitors = $api->process();
         $view->visitors = $visitors;
 
-        return $this->render($view, $fetch);
+        return $this->render($view);
     }
 
     private function setCounters($view)
@@ -157,7 +155,7 @@ class Controller extends \Piwik\Plugin\Controller
 
         $this->setWidgetizedVisitorProfileUrl($view);
 
-        echo $view->render();
+        return $view->render();
     }
 
     public function getSingleVisitSummary()
@@ -173,7 +171,7 @@ class Controller extends \Piwik\Plugin\Controller
         $view->showLocation = true;
         $this->setWidgetizedVisitorProfileUrl($view);
         $view->exportLink = $this->getVisitorProfileExportLink();
-        echo $view->render();
+        return $view->render();
     }
 
     public function getVisitList()
@@ -194,7 +192,7 @@ class Controller extends \Piwik\Plugin\Controller
         $view->idSite = Common::getRequestVar('idSite', null, 'int');
         $view->startCounter = Common::getRequestVar('filter_offset', 0, 'int') + 1;
         $view->visits = $nextVisits;
-        echo $view->render();
+        return $view->render();
     }
 
     private function getVisitorProfileExportLink()