diff options
| author | sbeaver <sbeaver@netgate.com> | 2015-04-24 10:39:40 -0400 |
|---|---|---|
| committer | sbeaver <sbeaver@netgate.com> | 2015-04-24 10:39:40 -0400 |
| commit | 64c3b4cd9547eee8ecb176319e786ae1ed474cc5 (patch) | |
| tree | 6b35cd1ed83970587080137b637d2178750a0c58 | |
| parent | 2e101d899984ae789e045df383cf277670c506b4 (diff) | |
| download | pfsense-64c3b4cd9547eee8ecb176319e786ae1ed474cc5.zip pfsense-64c3b4cd9547eee8ecb176319e786ae1ed474cc5.tar.gz | |
system.php bugfix
$timezonelist was an indexed array, causing the page to save the index
in the config, not the value.
| -rw-r--r-- | usr/local/www/system.php | 5 | ||||
| -rw-r--r-- | usr/local/www/widgets/widgets/system_information.widget.php | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/usr/local/www/system.php b/usr/local/www/system.php index 7574178..a8a3ea9 100644 --- a/usr/local/www/system.php +++ b/usr/local/www/system.php @@ -31,7 +31,7 @@ */ /* pfSense_BUILDER_BINARIES: /bin/kill /usr/bin/tar - pfSense_MODULE: system + pfSense_MODULE: system */ ##|+PRIV @@ -178,7 +178,6 @@ if ($_POST) { if (!$input_errors) { update_if_changed("hostname", $config['system']['hostname'], $_POST['hostname']); update_if_changed("domain", $config['system']['domain'], $_POST['domain']); - update_if_changed("timezone", $config['system']['timezone'], $_POST['timezone']); update_if_changed("NTP servers", $config['system']['timeservers'], strtolower($_POST['timeservers'])); update_if_changed("NTP update interval", $config['system']['time-update-interval'], $_POST['timeupdateinterval']); @@ -388,7 +387,7 @@ $section->addInput(new Form_Select( 'timezone', 'Timezone', $pconfig['timezone'], - $timezonelist + array_combine($timezonelist, $timezonelist) ))->setHelp('Select the location closest to you'); $section->addInput(new Form_Input( 'timeservers', diff --git a/usr/local/www/widgets/widgets/system_information.widget.php b/usr/local/www/widgets/widgets/system_information.widget.php index ad39313..0eb3716 100644 --- a/usr/local/www/widgets/widgets/system_information.widget.php +++ b/usr/local/www/widgets/widgets/system_information.widget.php @@ -73,7 +73,7 @@ if($_REQUEST['getupdatestatus']) { if (pfs_version_compare($current_installed_buildtime, $current_installed_version, $remote_version) == -1) { ?> <div class="alert alert-warning" role="alert"> - Version <?=$remote_version?> is available. <a href="/system_firmware_check.php" class="alert-link">Click Here</a> to view.</a> + Version <?=$remote_version?> is available. <a href="/system_firmware_check.php" class="alert-link">Click Here to view.</a> </div> <?php } else |
