Commit d332d16b authored by sun's avatar sun

Issue #811774 by sun: Fixed duplicate disabled warning when submitting settings form.

parent b817bab2
PHPMailer 7.x-3.x, xxxx-xx-xx
-----------------------------
#811774 by sun: Fixed duplicate disabled warning when submitting settings form.
#1188610 by sun: Fixed bogus variable $mail in exception handling.
#1183836 by sun: Fixed more verbose log messages required in case of an error.
#1183820 by sun: Allow sending test mail without globally enabling PHPMailer.
......
......@@ -26,7 +26,7 @@ function phpmailer_settings_form($form_state) {
$form['smtp_on']['#default_value'] = 0;
$form['smtp_on']['#description'] = t('MimeMail has been detected. To enable PHPMailer for mail transport, go to the <a href="@url">MimeMail settings page</a> and select PHPMailer from the available e-mail engines.', array('@url' => url('admin/config/system/mimemail')));
}
elseif (!variable_get('smtp_on', 0) && empty($form_state['post']['smtp_on'])) {
elseif (!variable_get('smtp_on', 0) && empty($form_state['input']['smtp_on'])) {
drupal_set_message(t('PHPMailer is currently disabled.'), 'warning');
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment