From c694bd651b49307dbc014deabbe40d6891e7e01a Mon Sep 17 00:00:00 2001 From: epriestley Date: Thu, 9 Jun 2016 13:17:58 -0700 Subject: [PATCH] Make base64 the default SMTP encoding MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Summary: Ref T11120. If this works, I'll just remove this option completely. Test Plan: ¯\_(ツ)_/¯ Reviewers: chad Reviewed By: chad Maniphest Tasks: T11120 Differential Revision: https://secure.phabricator.com/D16095 --- .../option/PhabricatorPHPMailerConfigOptions.php | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/applications/config/option/PhabricatorPHPMailerConfigOptions.php b/src/applications/config/option/PhabricatorPHPMailerConfigOptions.php index 6b999b0d55..2c0021341f 100644 --- a/src/applications/config/option/PhabricatorPHPMailerConfigOptions.php +++ b/src/applications/config/option/PhabricatorPHPMailerConfigOptions.php @@ -55,7 +55,7 @@ final class PhabricatorPHPMailerConfigOptions $this->newOption('phpmailer.smtp-password', 'string', null) ->setHidden(true) ->setDescription(pht('Password for SMTP.')), - $this->newOption('phpmailer.smtp-encoding', 'string', '8bit') + $this->newOption('phpmailer.smtp-encoding', 'string', 'base64') ->setSummary(pht('Configure how mail is encoded.')) ->setDescription( pht( @@ -64,14 +64,8 @@ final class PhabricatorPHPMailerConfigOptions "encoding. If you're having trouble with mail being mangled or ". "arriving with too many or too few newlines, you may try ". "adjusting this setting.\n\n". - "Supported values are `8bit` (default), `quoted-printable`, ". - "`7bit`, `binary` and `base64`.\n\n". - "The settings in the table below may work well.\n\n". - "| MTA | Setting | Notes\n". - "|-----|---------|------\n". - "| SendGrid via SMTP | `quoted-printable` | Double newlines under ". - "`8bit`.\n". - "| All Other MTAs | `8bit` | Default setting.")), + "Supported values are `8bit`, `quoted-printable`, ". + "`7bit`, `binary` and `base64`.")), ); }