diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2015-11-12 16:01:03 -0500 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2015-11-12 16:01:03 -0500 |
commit | 153e3ac201ed2794856267315ddbc121ec3603f9 (patch) | |
tree | f50e7d4bca4dbcbea8c2f722b89f96c348e04f2f /src | |
parent | 2bcf9a3bcd9bcfdb8f868c71bfb25f7b08b924bc (diff) | |
download | pfsense-153e3ac201ed2794856267315ddbc121ec3603f9.zip pfsense-153e3ac201ed2794856267315ddbc121ec3603f9.tar.gz |
Changes after testing on real hardware
Diffstat (limited to 'src')
-rw-r--r-- | src/etc/inc/upgrade_config.inc | 17 | ||||
-rw-r--r-- | src/usr/local/www/system_advanced_admin.php | 1 |
2 files changed, 8 insertions, 10 deletions
diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index 03023dd..ffb5ec5 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -4067,15 +4067,14 @@ function upgrade_126_to_127() { list($file, $col, $display) = explode(':', $widget); switch ($display) { - case 'hide': - $display = 'close'; - break; - case 'show': - $display = 'open'; - break; - default: - /* close, none or something is wrong here, ignore it */ - continue 2; + case 'hide': + $display = 'close'; + break; + case 'show': + $display = 'open'; + break; + default: + continue 2; } /* Remove '-container' from widget name */ diff --git a/src/usr/local/www/system_advanced_admin.php b/src/usr/local/www/system_advanced_admin.php index 2b9c39c..d4b0b62 100644 --- a/src/usr/local/www/system_advanced_admin.php +++ b/src/usr/local/www/system_advanced_admin.php @@ -472,7 +472,6 @@ $section->addInput(new Form_Checkbox( $csslist = glob("/Bootstrap/css/*.css"); unset($csslist['bootstrap.min.css']; - $csslist = array_combine($csslist, $csslist); $section->addInput(new Form_Select( |