diff options
| author | mattab <matthieu.aubry@gmail.com> | 2014-02-03 05:30:39 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2014-02-03 05:30:39 +0400 |
| commit | 2ca3e2a597c01c44f64cf40ca204cfbdc6847767 (patch) | |
| tree | 1d95c2c3dcf3d7af3142989f3411460ca5012ea1 /config | |
| parent | 9addbfd5c2f4b55758cce7fbcdca0f3912b42e79 (diff) | |
Fix issue that when the General settings are disabled, then the settings should be read from the config file rather than the DB.
Diffstat (limited to 'config')
| -rw-r--r-- | config/global.ini.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/config/global.ini.php b/config/global.ini.php index cb72888c21..69544f98b8 100644 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -153,11 +153,12 @@ default_period = day ; Time in seconds after which an archive will be computed again. This setting is used only for today's statistics. ; Defaults to 10 seconds so that by default, Piwik provides real time reporting. ; This setting is overriden in the UI, under "General Settings". -; This is the default value used if the setting hasn't been overriden via the UI. +; This setting is only used if it hasn't been overriden via the UI yet, or if enable_general_settings_admin=0 time_before_today_archive_considered_outdated = 10 -; This setting is overriden in the UI, under "General Settings". The default value is to allow browsers -; to trigger the Piwik archiving process. +; This setting is overriden in the UI, under "General Settings". +; The default value is to allow browsers to trigger the Piwik archiving process. +; This setting is only used if it hasn't been overriden via the UI yet, or if enable_general_settings_admin=0 enable_browser_archiving_triggering = 1 ; By default Piwik runs OPTIMIZE TABLE SQL queries to free spaces after deleting some data. |