Improve timezone pull-request and settings page

2014-02-24 18:08:58 -05:00
parent e374a6fd64
commit 64e2e07229
6 changed files with 17 additions and 14 deletions
--- 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()
        )));
    }