diff options
| author | doktornotor <notordoktor@gmail.com> | 2017-01-17 19:06:08 +0100 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-01-17 16:47:47 -0200 |
| commit | ab34907e62b01f622cfd27604e83a66e67df7040 (patch) | |
| tree | 81062cf348d68f2be9356d956317d3ef5fdb0614 /src | |
| parent | 83ddceca242a448de25a33707a613b8d16310191 (diff) | |
| download | pfsense-ab34907e62b01f622cfd27604e83a66e67df7040.zip pfsense-ab34907e62b01f622cfd27604e83a66e67df7040.tar.gz | |
Do not nag people about passwords mismatch when SMTP notifications are disabled (Bug #7129)
(cherry picked from commit 3988cfa7d281370500a7f58cb5f73f28a931f0ae)
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/local/www/system_advanced_notifications.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/usr/local/www/system_advanced_notifications.php b/src/usr/local/www/system_advanced_notifications.php index 52e1e42..95bc628 100644 --- a/src/usr/local/www/system_advanced_notifications.php +++ b/src/usr/local/www/system_advanced_notifications.php @@ -171,7 +171,10 @@ if ($_POST) { if ($_POST['smtppassword'] == $_POST['smtppassword_confirm']) { $config['notifications']['smtp']['password'] = $_POST['smtppassword']; } else { - $input_errors[] = gettext("SMTP passwords must match"); + if ($_POST['disable_smtp'] != "yes") { + // Bug #7129 - do not nag people about passwords mismatch when SMTP notifications are disabled + $input_errors[] = gettext("SMTP passwords must match"); + } } } |
