From 56fd056b9a67809effaeef27ba384f3a47ff481d Mon Sep 17 00:00:00 2001 From: Chris Buechler Date: Mon, 27 Jul 2015 01:57:50 -0500 Subject: [PATCH] add a check to avoid foreach on non-array --- etc/inc/upgrade_config.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 909d46f419..0ded2d85b4 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'];