summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'shared/functions/get_timezones.php')
-rw-r--r--shared/functions/get_timezones.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/shared/functions/get_timezones.php b/shared/functions/get_timezones.php
index 4c495cd..12ccc81 100644
--- a/shared/functions/get_timezones.php
+++ b/shared/functions/get_timezones.php
@@ -1,23 +1,23 @@
<?php
function &get_timezones($dir=null) {
- global $conf;
+ global $S;
static $results;
if ($dir == null) {
if (isset($results))
return $results;
$results=array();
- $dir=realpath($conf['timezone_root']);
+ $dir=realpath($S['conf']['timezone_root']);
}
foreach (glob($dir.'/*') as $file) {
if (is_dir($file) && !is_link($file))
get_timezones($file);
else {
- $file=substr($file, strlen($conf['timezone_root'])+1);
+ $file=substr($file, strlen($S['conf']['timezone_root'])+1);
if ($file != 'zone.tab')
$results[$file]=str_replace('_', ' ', $file);
}
}
- if ($dir == $conf['timezone_root']) {
+ if ($dir == $S['conf']['timezone_root']) {
natsort($results);
}
return $results;