summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2015-07-27 01:57:50 -0500
committerChris Buechler <cmb@pfsense.org>2015-07-27 01:57:58 -0500
commit2da055f0864bff7b2185aab047f114161d8def88 (patch)
treecbecfeb6a4b779caba41ac45dab537bfea03f1e7
parenta34e980753ec72d71c91c98a28c08b20caa30535 (diff)
downloadpfsense-2da055f0864bff7b2185aab047f114161d8def88.zip
pfsense-2da055f0864bff7b2185aab047f114161d8def88.tar.gz
add a check to avoid foreach on non-array
-rw-r--r--etc/inc/upgrade_config.inc4
1 files changed, 4 insertions, 0 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index 5838cac..3f14248 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -3789,6 +3789,10 @@ function upgrade_117_to_118() {
function upgrade_118_to_119() {
global $config;
+ if (!isset($config['ipsec']['phase1'])) {
+ return;
+ }
+
// change peerid_type to 'any' for EAP types to retain previous behavior of omitting rightid
$a_phase1 =& $config['ipsec']['phase1'];
OpenPOWER on IntegriCloud