Révision 0ee60267
Ajouté par Phil Davis il y a presque 10 ans
| etc/inc/upgrade_config.inc | ||
|---|---|---|
| 3150 | 3150 |
|
| 3151 | 3151 |
function upgrade_098_to_099() {
|
| 3152 | 3152 |
global $config; |
| 3153 |
|
|
| 3154 |
if (empty($config['dhcpd']) || !is_array($config['dhcpd'])) |
|
| 3155 |
return; |
|
| 3156 |
|
|
| 3153 | 3157 |
foreach ($config['dhcpd'] as & $dhcpifconf) {
|
| 3154 | 3158 |
if (isset($dhcpifconf['next-server'])) {
|
| 3155 | 3159 |
$dhcpifconf['nextserver'] = $dhcpifconf['next-server']; |
Formats disponibles : Unified diff
Handle no dhcpd settings when upgrading
This minor fix was in master but not 2.1 branch. I noticed the warning message when doing a fresh install/test of 2.1.4-release. It prevents the warning message:
Warning: Invalid argument supplied for foreach() in /etc/inc/upgrade_config.inc on line 3153
Might as well fix it it 2.1-branch also, in case there is another 2.1.n release.