diff options
| author | jim-p <jimp@netgate.com> | 2018-09-06 12:27:13 -0400 |
|---|---|---|
| committer | jim-p <jimp@netgate.com> | 2018-09-06 12:27:36 -0400 |
| commit | 1884979a4b9a32c15df429604731c0c6c5a86157 (patch) | |
| tree | 1cbf5136c0a30014539879fbe24a61a189058682 /src/etc | |
| parent | 7d80bbbede8eee0f6a5ffceecf06a147fe958981 (diff) | |
| download | pfsense-1884979a4b9a32c15df429604731c0c6c5a86157.zip pfsense-1884979a4b9a32c15df429604731c0c6c5a86157.tar.gz | |
Fix a PHP error when upgrading gateways
(cherry picked from commit bd670efef4c642ebb03b844ef0c38258740a37a1)
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/inc/upgrade_config.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/etc/inc/upgrade_config.inc b/src/etc/inc/upgrade_config.inc index fb86785..ea8441a 100644 --- a/src/etc/inc/upgrade_config.inc +++ b/src/etc/inc/upgrade_config.inc @@ -5651,7 +5651,7 @@ function upgrade_181_to_182() { } } } - if (count($newgroup4['item']) > 0) { + if (is_array($newgroup4['item']) && count($newgroup4['item']) > 0) { $newname = "Default_Gateway_Group_ipv4"; if (gateway_or_gwgroup_exists($newname)) { //make sure we create a new name $id = 2; @@ -5666,7 +5666,7 @@ function upgrade_181_to_182() { $config['gateways']['gateway_group'][] = $newgroup4; $config['gateways']['defaultgw4'] = $newname; } - if (count($newgroup6['item']) > 0) { + if (is_array($newgroup6['item']) && count($newgroup6['item']) > 0) { $newname = "Default_Gateway_Group_ipv6"; if (gateway_or_gwgroup_exists($newname)) { //make sure we create a new name $id = 2; |
