diff options
author | Renato Botelho <garga@FreeBSD.org> | 2014-06-27 16:21:23 -0300 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2014-06-27 16:21:23 -0300 |
commit | 6d74e3e97bb7d89ea1e8b6277978920a9cd55755 (patch) | |
tree | c9bab31044a856696df3089c8f39057921183868 /etc/inc | |
parent | 2bf2a1c4c9a4ed1c378891e2b0e55edf3ed1a658 (diff) | |
parent | 0ee6026764e74d79addb204e4ed8ed2d815ccd38 (diff) | |
download | pfsense-6d74e3e97bb7d89ea1e8b6277978920a9cd55755.zip pfsense-6d74e3e97bb7d89ea1e8b6277978920a9cd55755.tar.gz |
Merge pull request #1244 from phil-davis/patch-11
Diffstat (limited to 'etc/inc')
-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 7060079..1094325 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -3150,6 +3150,10 @@ function upgrade_097_to_098() { function upgrade_098_to_099() { global $config; + + if (empty($config['dhcpd']) || !is_array($config['dhcpd'])) + return; + foreach ($config['dhcpd'] as & $dhcpifconf) { if (isset($dhcpifconf['next-server'])) { $dhcpifconf['nextserver'] = $dhcpifconf['next-server']; |