Merge remote-tracking branch 'origin/master'

core/Plugin/Controller.php

@@ -736,7 +736,7 @@ abstract class Controller
             Piwik_ExitWithMessage($errorMessage, false, true);
         }
 
-        FrontController::getInstance()->dispatch(Piwik::getLoginPluginName(), false);
+        echo FrontController::getInstance()->dispatch(Piwik::getLoginPluginName(), false);
         exit;
     }
 

plugins/Goals/Controller.php

@@ -241,7 +241,7 @@ class Controller extends \Piwik\Plugin\Controller
         return $view->render();
     }
 
-    public function getEvolutionGraph(array $columns = array(), $idGoal = false)
+    public function getEvolutionGraph($fetch = false, array $columns = array(), $idGoal = false)
     {
         if (empty($columns)) {
             $columns = Common::getRequestVar('columns');

plugins/Installation/Installation.php

@@ -11,6 +11,7 @@
 namespace Piwik\Plugins\Installation;
 
 use Piwik\Common;
+use Piwik\FrontController;
 use Piwik\Menu\MenuAdmin;
 use Piwik\Piwik;
 use Piwik\Translate;
@@ -66,7 +67,7 @@ class Installation extends \Piwik\Plugin
         if (in_array($step, array_keys($controller->getInstallationSteps()))
             || $isActionWhiteListed
         ) {
-            $controller->$step($message);
+            echo FrontController::getInstance()->dispatch('Installation', $step, array($message));
         } else {
             Piwik::exitWithErrorMessage(Piwik::translate('Installation_NoConfigFound'));
         }

plugins/Login/Controller.php

@@ -62,7 +62,7 @@ class Controller extends \Piwik\Plugin\Controller
      */
     function index()
     {
-        $this->login();
+        return $this->login();
     }
 
     /**
@@ -335,8 +335,7 @@ class Controller extends \Piwik\Plugin\Controller
             return;
         } else {
             // show login page w/ error. this will keep the token in the URL
-            $this->login($errorMessage);
-            return;
+            return $this->login($errorMessage);
         }
     }
 
@@ -372,7 +371,7 @@ class Controller extends \Piwik\Plugin\Controller
      */
     public function resetPasswordSuccess()
     {
-        $this->login($errorMessage = null, $infoMessage = Piwik::translate('Login_PasswordChanged'));
+        return $this->login($errorMessage = null, $infoMessage = Piwik::translate('Login_PasswordChanged'));
     }
 
     /**

plugins/Referrers/Controller.php

@@ -146,8 +146,6 @@ class Controller extends \Piwik\Plugin\Controller
      * Returns or echo's a report that shows all search keyword, website and campaign
      * referrer information in one report.
      *
-     * @param bool $fetch True if the report HTML should be returned. If false, the
-     *                    report is echo'd and nothing is returned.
      * @return string The report HTML or nothing if $fetch is set to false.
      */
     public function getAll()

plugins/UserCountryMap/Controller.php

@@ -29,7 +29,7 @@ class Controller extends \Piwik\Plugin\Controller
     // By default plot up to the last 30 days of visitors on the map, for low traffic sites
     const REAL_TIME_WINDOW = 'last30';
 
-    public function visitorMap($segmentOverride = false)
+    public function visitorMap($fetch = false, $segmentOverride = false)
     {
         $this->checkUserCountryPluginEnabled();