diff options
| author | sgiehl <stefan@matomo.org> | 2020-07-24 14:11:05 +0300 |
|---|---|---|
| committer | sgiehl <stefan@matomo.org> | 2020-07-24 15:28:48 +0300 |
| commit | 679e73f1236969db0c2d767655cb84456a727d24 (patch) | |
| tree | 648722fa79cb524f8819857e79163e0c1cf16d59 /config | |
| parent | 6b5f8138180716d5088d764f0b41d5787159b28a (diff) | |
| parent | 3e1234a887f56a1cf853e29ba89370b234af5127 (diff) | |
Merge branch '3.x-dev' into 4.x-dev
Diffstat (limited to 'config')
| -rwxr-xr-x | config/global.ini.php | 6 | ||||
| -rw-r--r-- | config/global.php | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/config/global.ini.php b/config/global.ini.php index a15991e392..7c1ba59e37 100755 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -62,7 +62,7 @@ host = localhost username = "@USERNAME@" password = dbname = matomo_tests -tables_prefix = matomotests_ +tables_prefix = port = 3306 adapter = PDO\MYSQL type = InnoDB @@ -744,8 +744,8 @@ enable_tracking_failures_notification = 1 [Tracker] ; When enabled and a userId is set, then the visitorId will be automatically set based on the userId. This allows to -; identify the same user as the same visitor across devices. -; Disabling this feature can be useful for example when using the third party cookie, where all Matomo tracked sites +; identify the same user as the same visitor across devices. +; Disabling this feature can be useful for example when using the third party cookie, where all Matomo tracked sites ; use the same "global" visitorId for a device and you want to see when the same user switches between devices. enable_userid_overwrites_visitorid = 1 diff --git a/config/global.php b/config/global.php index ab4a17119a..9b199520dc 100644 --- a/config/global.php +++ b/config/global.php @@ -79,6 +79,8 @@ return array( 'Piwik\Translation\Loader\LoaderInterface' => DI\object('Piwik\Translation\Loader\LoaderCache') ->constructor(DI\get('Piwik\Translation\Loader\JsonFileLoader')), + 'DeviceDetector\Cache\Cache' => DI\object('Piwik\DeviceDetector\DeviceDetectorCache')->constructor(86400), + 'observers.global' => array(), /** |