diff options
| author | Chris Buechler <cmb@pfsense.org> | 2016-02-17 19:28:45 -0600 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2016-02-17 19:28:45 -0600 |
| commit | a10eabe6ff1b062c403d70af9358c00e6bbef4c5 (patch) | |
| tree | 6c3784867cf8ea8afd6dd52f9e965e7d1922545f /src/etc | |
| parent | c6c187f3d8f0ac83d230e58c3c3863b2be567d1a (diff) | |
| download | pfsense-a10eabe6ff1b062c403d70af9358c00e6bbef4c5.zip pfsense-a10eabe6ff1b062c403d70af9358c00e6bbef4c5.tar.gz | |
Need $config here. No need to check count() as it'll always evaluate to true where is_array does. Ticket #4312
Diffstat (limited to 'src/etc')
| -rw-r--r-- | src/etc/inc/interfaces.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 8b498bc..86276b5 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -688,6 +688,7 @@ function interface_bridge_configure_advanced($bridge) { } function interface_bridge_add_member($bridgeif, $interface, $flagsapplied = false) { + global $config; if (!does_interface_exist($bridgeif) || !does_interface_exist($interface)) { return; @@ -705,7 +706,7 @@ function interface_bridge_add_member($bridgeif, $interface, $flagsapplied = fals } pfSense_bridge_add_member($bridgeif, $interface); - if (is_array($config['bridges']['bridged']) && count($config['bridges']['bridged'])) { + if (is_array($config['bridges']['bridged'])) { foreach ($config['bridges']['bridged'] as $bridge) { if ($bridgeif == $bridge['bridgeif']) { interface_bridge_configure_stp($bridge); |
