diff options
| author | jim-p <jimp@pfsense.org> | 2011-06-29 11:22:23 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2011-06-29 11:22:23 -0400 |
| commit | 5962f766e95258b6ea596b243ff405a3f5f6531d (patch) | |
| tree | 1c993f29984f629b9badfda07c3a69e15004e6e4 /etc | |
| parent | dfa766ffcc924e8d7d2869a8619f0941dd3298d1 (diff) | |
| download | pfsense-5962f766e95258b6ea596b243ff405a3f5f6531d.zip pfsense-5962f766e95258b6ea596b243ff405a3f5f6531d.tar.gz | |
Check if an item is an array before treating it as such in the upgrade code.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/upgrade_config.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 685cb13..c0fd8cb 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -2455,9 +2455,9 @@ function upgrade_070_to_071() { function rename_field(& $section, $oldname, $newname) { if (is_array($section)) { foreach($section as & $item) { - if (!empty($item[$oldname])) + if (is_array($item) && !empty($item[$oldname])) $item[$newname] = $item[$oldname]; - if (isset($item[$oldname])) + if (is_array($item) && isset($item[$oldname])) unset($item[$oldname]); } } |
