aboutsummaryrefslogtreecommitdiffstats
path: root/mod/setup.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-01 22:33:28 -0800
committerfriendica <info@friendica.com>2015-01-01 22:33:28 -0800
commit82d0a4af452015e870bdcea56f1008ea22d066b3 (patch)
tree3ad1db1aeb0dfdeb10a70b99da353fe3094f1d69 /mod/setup.php
parent9a34e18319301e0a952f674899aeb58b424637a4 (diff)
parent68c612c597471404201099ecbc8b4082d152e18a (diff)
downloadvolse-hubzilla-82d0a4af452015e870bdcea56f1008ea22d066b3.tar.gz
volse-hubzilla-82d0a4af452015e870bdcea56f1008ea22d066b3.tar.bz2
volse-hubzilla-82d0a4af452015e870bdcea56f1008ea22d066b3.zip
Merge branch 'master' into trinidad
Diffstat (limited to 'mod/setup.php')
-rwxr-xr-xmod/setup.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/setup.php b/mod/setup.php
index 044def15a..6f2c7c074 100755
--- a/mod/setup.php
+++ b/mod/setup.php
@@ -349,7 +349,7 @@ function setup_content(&$a) {
'$siteurl' => array('siteurl', t('Website URL'), z_root(), t('Please use SSL (https) URL if available.')),
- '$timezone' => field_timezone('timezone', t('Please select a default timezone for your website'), $timezone, ''),
+ '$timezone' => array('timezone', t('Please select a default timezone for your website'), $timezone, '', get_timezones()),
'$baseurl' => $a->get_baseurl(),