diff options
author | Chris Buechler <cmb@pfsense.org> | 2015-07-27 01:57:50 -0500 |
---|---|---|
committer | Chris Buechler <cmb@pfsense.org> | 2015-07-27 01:57:50 -0500 |
commit | 56fd056b9a67809effaeef27ba384f3a47ff481d (patch) | |
tree | e074d31f90f0b43518957b9f2e977fd1fac878be | |
parent | 5e11c6a176d70f1caa987e64a01a8f996b18aad7 (diff) | |
download | pfsense-56fd056b9a67809effaeef27ba384f3a47ff481d.zip pfsense-56fd056b9a67809effaeef27ba384f3a47ff481d.tar.gz |
add a check to avoid foreach on non-arrayRELENG_2_2_4
-rw-r--r-- | etc/inc/upgrade_config.inc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 909d46f..0ded2d8 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -3604,6 +3604,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']; |