diff options
| author | diosmosis <benaka@piwik.pro> | 2015-04-18 11:55:47 +0300 |
|---|---|---|
| committer | diosmosis <benaka@piwik.pro> | 2015-04-18 12:08:36 +0300 |
| commit | 1760412a370823f96eeed21d730acf8f4038c843 (patch) | |
| tree | 76b4c6ca0a2f9678b34d247e09e609b9ff7fc108 /config | |
| parent | 5d57e10591a9e7e394f649cc67ea93ed14c47292 (diff) | |
| parent | 898afb809d54553dea34e4d101e66b37f50f0334 (diff) | |
Merge branch 'master' into config_step_2
Conflicts:
config/global.php
core/CliMulti/RequestCommand.php
core/Config.php
core/Config/IniFileChain.php
tests/PHPUnit/System/BlobReportLimitingTest.php
tests/PHPUnit/TestingEnvironment.php
tests/PHPUnit/Unit/Config/IniFileChainTest.php
tests/PHPUnit/Unit/ConfigTest.php
Diffstat (limited to 'config')
| -rw-r--r-- | config/environment/cli.php | 2 | ||||
| -rw-r--r-- | config/environment/dev.php | 4 | ||||
| -rw-r--r-- | config/global.ini.php | 4 | ||||
| -rw-r--r-- | config/global.php | 3 |
4 files changed, 8 insertions, 5 deletions
diff --git a/config/environment/cli.php b/config/environment/cli.php index 2852c01007..0db3009ad4 100644 --- a/config/environment/cli.php +++ b/config/environment/cli.php @@ -10,7 +10,7 @@ return array( // Log 'log.handlers' => array( - DI\link('Symfony\Bridge\Monolog\Handler\ConsoleHandler'), + DI\get('Symfony\Bridge\Monolog\Handler\ConsoleHandler'), ), 'Symfony\Bridge\Monolog\Handler\ConsoleHandler' => function (ContainerInterface $c) { // Override the default verbosity map to make it more verbose by default diff --git a/config/environment/dev.php b/config/environment/dev.php index 0a730d708c..a8bedecca9 100644 --- a/config/environment/dev.php +++ b/config/environment/dev.php @@ -5,8 +5,8 @@ return array( 'Piwik\Cache\Backend' => DI\object('Piwik\Cache\Backend\ArrayCache'), 'Piwik\Translation\Loader\LoaderInterface' => DI\object('Piwik\Translation\Loader\LoaderCache') - ->constructor(DI\link('Piwik\Translation\Loader\DevelopmentLoader')), + ->constructor(DI\get('Piwik\Translation\Loader\DevelopmentLoader')), 'Piwik\Translation\Loader\DevelopmentLoader' => DI\object() - ->constructor(DI\link('Piwik\Translation\Loader\JsonFileLoader')), + ->constructor(DI\get('Piwik\Translation\Loader\JsonFileLoader')), ); diff --git a/config/global.ini.php b/config/global.ini.php index 4e075a22a4..526f8b3e24 100644 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -462,7 +462,8 @@ enable_trusted_host_check = 1 ; Examples: ;cors_domains[] = http://example.com ;cors_domains[] = http://stats.example.com -; OR allow for all domains +; +; Or you may allow cross domain requests for all domains with: ;cors_domains[] = * ; If you use this Piwik instance over multiple hostnames, Piwik will need to know @@ -719,6 +720,7 @@ password = ; Proxy password: optional; if specified, username is mandatory Plugins[] = CorePluginsAdmin Plugins[] = CoreAdminHome Plugins[] = CoreHome +Plugins[] = Diagnostics Plugins[] = CoreVisualizations Plugins[] = Proxy Plugins[] = API diff --git a/config/global.php b/config/global.php index 0cb88f5b3d..8fa70111a1 100644 --- a/config/global.php +++ b/config/global.php @@ -60,5 +60,6 @@ return array( 'Psr\Log\LoggerInterface' => DI\object('Psr\Log\NullLogger'), 'Piwik\Translation\Loader\LoaderInterface' => DI\object('Piwik\Translation\Loader\LoaderCache') - ->constructor(DI\link('Piwik\Translation\Loader\JsonFileLoader')), + ->constructor(DI\get('Piwik\Translation\Loader\JsonFileLoader')), + ); |