summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorErmal Luçi <eri@pfsense.org>2008-09-02 22:42:39 +0000
committerErmal Luçi <eri@pfsense.org>2008-09-02 22:42:39 +0000
commita174a5ac9e9126730d9e3d9ee13a5656bc0c8f7f (patch)
tree5bb1bdbf700db230ddd4d0f41f2a2ffebcfeb542 /etc
parent0b31cf3e7c947ab562c964768aeabd062a4367fc (diff)
downloadpfsense-a174a5ac9e9126730d9e3d9ee13a5656bc0c8f7f.zip
pfsense-a174a5ac9e9126730d9e3d9ee13a5656bc0c8f7f.tar.gz
Use newer php5 features, to be safer on upgrade side.
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/config.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 95ddfad..e6f7c7a 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -1235,8 +1235,8 @@ endif;
/* Convert 4.4 -> 4.5 */
if ($config['version'] <= 4.4) {
if (is_array($config['vlans']['vlan']) && count($config['vlans']['vlan'])) {
- foreach ($config['vlans']['vlan'] as $id => $vlan)
- $config['vlans']['vlan'][$id]['vlanif'] = "vlan{$id}";
+ foreach ($config['vlans']['vlan'] as $id => &$vlan)
+ $vlan['vlanif'] = "vlan{$id}";
}
$config['version'] = "4.5";
}
@@ -2277,7 +2277,7 @@ EOD;
if($config['interfaces']['opt' . $i1]['descr'])
echo "\nOptional interface {$i1} description found: {$config['interfaces']['opt' . $i1]['descr']}";
-
+
echo "\nEnter the Optional {$i1} interface name or 'a' for auto-detection\n" .
"(or nothing if finished): ";
@@ -2533,7 +2533,7 @@ EOD;
echo "\nInvalid VLAN tag '{$vlan['tag']}'\n";
continue;
}
-
+
$config['vlans']['vlan'][] = $vlan;
}
}
OpenPOWER on IntegriCloud