From 2da055f0864bff7b2185aab047f114161d8def88 Mon Sep 17 00:00:00 2001
From: Chris Buechler <cmb@pfsense.org>
Date: Mon, 27 Jul 2015 01:57:50 -0500
Subject: add a check to avoid foreach on non-array

---
 etc/inc/upgrade_config.inc | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'etc/inc')

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'];
 
-- 
cgit v1.1