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:54:43 -0300 |
commit | 2a8849119c7c48976161faeaedc477c347e9b724 (patch) | |
tree | 7a10cdff9cabd99c488f682122f7cf3be4474cba /src | |
parent | c4045b79ec87ee1ab4305543f1c3af31d0cfb8c9 (diff) | |
download | pfsense-2a8849119c7c48976161faeaedc477c347e9b724.zip pfsense-2a8849119c7c48976161faeaedc477c347e9b724.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')
-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', |