summaryrefslogtreecommitdiffstats
path: root/etc/inc
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2012-02-07 19:05:35 +0000
committerErmal <eri@pfsense.org>2012-02-07 19:06:31 +0000
commit67e73dcd0663222e2d9c803e50a4a15104f8bc08 (patch)
treeaf3f3a496c87fd306ef80caa13bfe9da43ce2e7d /etc/inc
parentc7fc14a1b9f17f5c0f55dcdcb9fb383fecbda8c0 (diff)
downloadpfsense-67e73dcd0663222e2d9c803e50a4a15104f8bc08.zip
pfsense-67e73dcd0663222e2d9c803e50a4a15104f8bc08.tar.gz
Fixes #1999. Upgrade bvoucher config as well during CP upgrade to multi-instance
Diffstat (limited to 'etc/inc')
-rw-r--r--etc/inc/upgrade_config.inc7
1 files changed, 7 insertions, 0 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 6c8331b..6dd276d 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -2738,5 +2738,12 @@ function upgrade_082_to_083() {
$config['captiveportal']['cpZone'] = $tmpcp;
$config['captiveportal']['cpZone']['zoneid'] = 8000;
}
+ if (!empty($config['voucher'])) {
+ $tmpcp = $config['voucher'];
+ $config['voucher'] = array();
+ $config['voucher']['cpZone'] = array();
+ $config['voucher']['cpZone'] = $tmpcp;
+ }
}
+
?>
OpenPOWER on IntegriCloud