diff options
| author | mattab <matthieu.aubry@gmail.com> | 2014-12-22 02:01:13 +0300 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2014-12-22 02:01:13 +0300 |
| commit | 026ad32efbc63f2d6a47d97fca69e5e5027f4fa4 (patch) | |
| tree | ce3318dfbc13f58dc907f6b5e9abdab70355e666 /plugins/Installation/Controller.php | |
| parent | d9e2efabc395421987a264a8cc064423a1ed4492 (diff) | |
Attempting to fix build by detecting that Piwik is already installed within tests
Diffstat (limited to 'plugins/Installation/Controller.php')
| -rw-r--r-- | plugins/Installation/Controller.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php index bf6920dffc..7641624cb3 100644 --- a/plugins/Installation/Controller.php +++ b/plugins/Installation/Controller.php @@ -557,7 +557,8 @@ class Controller extends \Piwik\Plugin\ControllerAdmin \Piwik\Plugins\Login\Controller::clearSession(); $message = Piwik::translate('Installation_InvalidStateError', array('<br /><strong>', - '</strong><a href=\'' . Common::sanitizeInputValue(Url::getCurrentUrlWithoutFileName()) . '\'>', + // piwik-is-already-installed is checked against in checkPiwikServerWorking + '</strong><a id="piwik-is-already-installed" href=\'' . Common::sanitizeInputValue(Url::getCurrentUrlWithoutFileName()) . '\'>', '</a>') ); Piwik::exitWithErrorMessage($message); |