summaryrefslogtreecommitdiffstats
path: root/src/etc/inc/upgrade_config.inc
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-11-12 15:19:37 -0200
committerRenato Botelho <renato@netgate.com>2015-11-12 15:20:52 -0200
commit303d345dd5e7ead6975bd3140b213219d7e0f4f0 (patch)
treeb34258b1e785d095d6bb6476ae8791a40cae98b4 /src/etc/inc/upgrade_config.inc
parentd0499e38957a4302bb01b12353e0910d6961bc99 (diff)
downloadpfsense-303d345dd5e7ead6975bd3140b213219d7e0f4f0.zip
pfsense-303d345dd5e7ead6975bd3140b213219d7e0f4f0.tar.gz
Fix upgrade_126_to_127()
- Do not discard items with $display already set to open or close - Call continue 2 to move to next widget
Diffstat (limited to 'src/etc/inc/upgrade_config.inc')
-rw-r--r--src/etc/inc/upgrade_config.inc6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc
index ea38fbf..22c0852 100644
--- a/src/etc/inc/upgrade_config.inc
+++ b/src/etc/inc/upgrade_config.inc
@@ -4067,6 +4067,10 @@ function upgrade_126_to_127() {
list($file, $col, $display) = explode(':', $widget);
switch ($display) {
+ case 'close':
+ case 'open':
+ /* keep already converted items */
+ break;
case 'hide':
$display = 'close';
break;
@@ -4075,7 +4079,7 @@ function upgrade_126_to_127() {
break;
default:
/* close, none or something is wrong here, ignore it */
- continue;
+ continue 2;
}
/* Remove '-container' from widget name */
OpenPOWER on IntegriCloud