diff options
Diffstat (limited to 'plugins/Installation')
5 files changed, 7 insertions, 9 deletions
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php index a99ee07929..1f85083ef1 100644 --- a/plugins/Installation/Controller.php +++ b/plugins/Installation/Controller.php @@ -16,7 +16,6 @@ use Piwik\Config; use Piwik\Container\StaticContainer; use Piwik\DataAccess\ArchiveTableCreator; use Piwik\Db; -use Piwik\Db\Adapter; use Piwik\DbHelper; use Piwik\Filesystem; use Piwik\Http; @@ -26,11 +25,9 @@ use Piwik\Plugin\Manager; use Piwik\Plugins\Diagnostics\DiagnosticService; use Piwik\Plugins\LanguagesManager\LanguagesManager; use Piwik\Plugins\SitesManager\API as APISitesManager; -use Piwik\Plugins\UserCountry\LocationProvider; use Piwik\Plugins\UsersManager\API as APIUsersManager; use Piwik\ProxyHeaders; use Piwik\SettingsPiwik; -use Piwik\Theme; use Piwik\Tracker\TrackerCodeGenerator; use Piwik\Translation\Translator; use Piwik\Updater; @@ -207,6 +204,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin DbHelper::createTables(); DbHelper::createAnonymousUser(); + DbHelper::recordInstallVersion(); $this->updateComponents(); diff --git a/plugins/Installation/lang/en.json b/plugins/Installation/lang/en.json index e07969a7bc..ff98d6a776 100644 --- a/plugins/Installation/lang/en.json +++ b/plugins/Installation/lang/en.json @@ -118,7 +118,7 @@ "SystemCheckSummaryThereWereWarnings": "There are some issues with your system. Matomo will run, but you might experience some minor problems.", "SystemCheckTimeLimitHelp": "On a high traffic website, executing the archiving process may require more time than currently allowed. If necessary, change the max_execution_time directive in your php.ini file.", "SystemCheckTracker": "Tracker status", - "SystemCheckTrackerHelp": "GET request to piwik.php failed. Try whitelisting this URL from HTTP Authentication and disable mod_security (you may have to ask your webhost). For more information about the error, check your web server error log file.", + "SystemCheckTrackerHelp": "GET request to matomo.php failed. Try whitelisting this URL from HTTP Authentication and disable mod_security (you may have to ask your webhost). For more information about the error, check your web server error log file.", "SystemCheckWarnDomHelp": "You should enable the \"dom\" extension (e.g., install the \"php-dom\" and\/or \"php-xml\" package).", "SystemCheckWarning": "Matomo will work normally but some features may be missing", "SystemCheckWarnJsonHelp": "You should enable \"json\" extension (e.g., install the \"php-json\" package) for better performance.", diff --git a/plugins/Installation/templates/welcome.twig b/plugins/Installation/templates/welcome.twig index 3931478426..d32805f469 100644 --- a/plugins/Installation/templates/welcome.twig +++ b/plugins/Installation/templates/welcome.twig @@ -12,7 +12,7 @@ // client-side test for broken tracker (e.g., mod_security rule) $('.next-step').hide(); $.ajax({ - url: 'piwik.php', + url: 'matomo.php', data: 'url=http://example.com', complete: function () { $('.next-step').show(); diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_js_tracking.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_js_tracking.png index 56eac1cb87..64c6dfada7 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_js_tracking.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_js_tracking.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3364ab2ed6eb9dd48eb48025bad28ae19c81facee829e2207474d5fe1efb39f -size 224953 +oid sha256:a403a5493fdb7a8dbf22cd99caafbf6b0c0b2ce837f59544f9bd839a7a114fd9 +size 224949 diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png index 2afe761ea9..5fe151af69 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_system_check.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca311ba80d2d5525a6ea9addf44161c2d960b3ec888a10f50e9fece4f9d7ba5d -size 192039 +oid sha256:1045b739708a3086bf86d862afc6ed61ea00bf9e0113854a10941f30f6213fa6 +size 192412 |
