diff options
| author | Renato Botelho <renato@netgate.com> | 2016-07-07 11:54:43 -0300 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-07-07 11:55:00 -0300 |
| commit | 1729ee29012ec92e61bc1d005635f9275fae3a4e (patch) | |
| tree | dc09692f4806257d0f967dcb101ddf4dca3527db /src/usr/local | |
| parent | bada7f8bbc0beada9e58696e5df28ab359692cc5 (diff) | |
| download | pfsense-1729ee29012ec92e61bc1d005635f9275fae3a4e.zip pfsense-1729ee29012ec92e61bc1d005635f9275fae3a4e.tar.gz | |
Do not check platform to decide if enableserial and primaryconsole fields will be hidden, global parameters are the rule to decide it. Fixes #6291
Diffstat (limited to 'src/usr/local')
| -rw-r--r-- | src/usr/local/www/system_advanced_admin.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/usr/local/www/system_advanced_admin.php b/src/usr/local/www/system_advanced_admin.php index c926e5b..86211f3 100644 --- a/src/usr/local/www/system_advanced_admin.php +++ b/src/usr/local/www/system_advanced_admin.php @@ -505,7 +505,7 @@ $section->addInput(new Form_Input( $form->add($section); $section = new Form_Section('Serial Communications'); -if (!$g['enableserial_force'] && ($g['platform'] == $g['product_name'] || $g['platform'] == "cdrom")) { +if (!$g['enableserial_force']) { $section->addInput(new Form_Checkbox( 'enableserial', 'Serial Terminal', @@ -524,7 +524,7 @@ $section->addInput(new Form_Select( array_combine(array(115200, 57600, 38400, 19200, 14400, 9600), array(115200, 57600, 38400, 19200, 14400, 9600)) ))->setHelp('Allows selection of different speeds for the serial console port.'); -if (!$g['enableserial_force'] && ($g['platform'] == $g['product_name'] || $g['platform'] == "cdrom")) { +if (!$g['enableserial_force'] && !$g['primaryconsole_force']) { $section->addInput(new Form_Select( 'primaryconsole', 'Primary Console', |
