diff options
| author | Vinicius Coque <vinicius.coque@bluepex.com> | 2010-12-14 10:03:36 -0200 |
|---|---|---|
| committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2010-12-14 10:03:36 -0200 |
| commit | d299e102a700a88fb3e370d9dfcda295574ade06 (patch) | |
| tree | bb00b71175bd156dfeb9f5939d845df7dc0e5277 /usr/local/www/fbegin.inc | |
| parent | ca98b042b87cd3780900c2a5a937afecdf3c523d (diff) | |
| parent | c9b08a50f0ba328ac0569247eb2063d34f7e6279 (diff) | |
| download | pfsense-d299e102a700a88fb3e370d9dfcda295574ade06.zip pfsense-d299e102a700a88fb3e370d9dfcda295574ade06.tar.gz | |
Merge remote branch 'mainline/master'
Conflicts:
usr/local/www/fbegin.inc
Diffstat (limited to 'usr/local/www/fbegin.inc')
| -rwxr-xr-x | usr/local/www/fbegin.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc index c124cdb..45a14a2 100755 --- a/usr/local/www/fbegin.inc +++ b/usr/local/www/fbegin.inc @@ -170,9 +170,9 @@ $ifentries = get_configured_interface_with_descr(); foreach ($ifentries as $ent => $entdesc) { if (is_array($config['interfaces'][$ent]['wireless']) && preg_match($g['wireless_regex'], $config['interfaces'][$ent]['if'])) - $ifdescrs[$ent] = $entdesc; + $wifdescrs[$ent] = $entdesc; } -if (count($ifdescrs) > 0) +if (count($wifdescrs) > 0) $status_menu[] = array(gettext("Wireless"), "/status_wireless.php"); $status_menu = msort(array_merge($status_menu, return_ext_menu("Status")),0); |
