summaryrefslogtreecommitdiff
path: root/controllers
diff options
context:
space:
mode:
authorFrédéric Guillot <contact@fredericguillot.com>2014-02-24 18:08:58 -0500
committerFrédéric Guillot <contact@fredericguillot.com>2014-02-24 18:08:58 -0500
commit64e2e072294563b7c834382c2de631687f235fe8 (patch)
treecdfc0e7ae9b72e2d6166376a8c757a0325152c30 /controllers
parente374a6fd6499b50d4587d136490ced7444f8bc2b (diff)
Improve timezone pull-request and settings page
Diffstat (limited to 'controllers')
-rw-r--r--controllers/config.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/controllers/config.php b/controllers/config.php
index 51a04079..5dfa828b 100644
--- a/controllers/config.php
+++ b/controllers/config.php
@@ -16,7 +16,7 @@ class Config extends Base
'errors' => array(),
'menu' => 'config',
'title' => t('Settings'),
- 'timezones' => array_combine(timezone_identifiers_list(), timezone_identifiers_list())
+ 'timezones' => $this->config->getTimezones()
)));
}
@@ -49,7 +49,7 @@ class Config extends Base
'errors' => $errors,
'menu' => 'config',
'title' => t('Settings'),
- 'timezones' => array_combine(timezone_identifiers_list(), timezone_identifiers_list())
+ 'timezones' => $this->config->getTimezones()
)));
}