diff options
| author | Erik Fonnesbeck <efonnes@gmail.com> | 2010-02-24 12:12:23 -0700 |
|---|---|---|
| committer | Erik Fonnesbeck <efonnes@gmail.com> | 2010-02-26 01:00:37 -0700 |
| commit | 9c17db74d46dec0e92e554c18156718620692afc (patch) | |
| tree | d8d5a01b52060a51c0478e59efd9c8ae7d940cbf /usr/local/www/interfaces_bridge.php | |
| parent | 23e69ae8da0f3f1d605d741612fdcee896ef8160 (diff) | |
| download | pfsense-9c17db74d46dec0e92e554c18156718620692afc.zip pfsense-9c17db74d46dec0e92e554c18156718620692afc.tar.gz | |
Revert "Fix the check for whether the bridge is assigned."
This reverts commit 3a669df20b0795b2e487fc033f86eacea7e6fdf4.
Diffstat (limited to 'usr/local/www/interfaces_bridge.php')
| -rw-r--r-- | usr/local/www/interfaces_bridge.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr/local/www/interfaces_bridge.php b/usr/local/www/interfaces_bridge.php index 8cb8bda..2806005 100644 --- a/usr/local/www/interfaces_bridge.php +++ b/usr/local/www/interfaces_bridge.php @@ -46,12 +46,12 @@ if (!is_array($config['bridges']['bridged'])) $a_bridges = &$config['bridges']['bridged'] ; -function bridge_inuse($bridgeif) { +function bridge_inuse($num) { global $config; $iflist = get_configured_interface_list(false, true); foreach ($iflist as $if) { - if ($config['interfaces'][$if]['if'] == $bridgeif) + if ($config['interfaces'][$if]['if'] == $a_bridges[$num]['bridgeif']) return true; } @@ -60,7 +60,7 @@ function bridge_inuse($bridgeif) { if ($_GET['act'] == "del") { /* check if still in use */ - if (bridge_inuse($a_bridges[$_GET['id']]['bridgeif'])) { + if (bridge_inuse($_GET['id'])) { $input_errors[] = "This bridge TUNNEL cannot be deleted because it is still being used as an interface."; } else { mwexec("/sbin/ifconfig " . $a_bridges[$_GET['id']]['bridgeif'] . " destroy"); |
