diff options
| author | Pim van den Berg | 2013-12-29 07:01:40 -0800 |
|---|---|---|
| committer | Pim van den Berg | 2013-12-29 07:01:40 -0800 |
| commit | de6cacbf32859f8176b2fa2ea4cab2dd8efe4238 (patch) | |
| tree | 0f181559a2e00546f42efe4241982d318ccdf12e /conf/config.php | |
| parent | Merge pull request #32 from jbergstroem/parantheses_in_names (diff) | |
| parent | Add default timezone when system one is missing (diff) | |
| download | apt-panopticon_cgp-de6cacbf32859f8176b2fa2ea4cab2dd8efe4238.zip apt-panopticon_cgp-de6cacbf32859f8176b2fa2ea4cab2dd8efe4238.tar.gz apt-panopticon_cgp-de6cacbf32859f8176b2fa2ea4cab2dd8efe4238.tar.bz2 apt-panopticon_cgp-de6cacbf32859f8176b2fa2ea4cab2dd8efe4238.tar.xz | |
Merge pull request #38 from oohlaf/timezone
Add default timezone when system one is missing
Diffstat (limited to 'conf/config.php')
| -rw-r--r-- | conf/config.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/conf/config.php b/conf/config.php index 6c0572e..7107841 100644 --- a/conf/config.php +++ b/conf/config.php | |||
| @@ -66,6 +66,9 @@ $CONFIG['detail-heigth'] = 350; | |||
| 66 | # disabled: NULL | 66 | # disabled: NULL |
| 67 | $CONFIG['socket'] = NULL; | 67 | $CONFIG['socket'] = NULL; |
| 68 | 68 | ||
| 69 | # system default timezone when not set | ||
| 70 | $CONFIG['default_timezone'] = 'UTC'; | ||
| 71 | |||
| 69 | 72 | ||
| 70 | # load local configuration | 73 | # load local configuration |
| 71 | if (file_exists(dirname(__FILE__).'/config.local.php')) | 74 | if (file_exists(dirname(__FILE__).'/config.local.php')) |