Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/PHPMailer/PHPMailer
Browse files Browse the repository at this point in the history
  • Loading branch information
jimjag committed Oct 30, 2018
2 parents 0fda1bf + 3c90248 commit cb4e2ae
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ jobs:
- php: 7.1
env: CODE_COVERAGE=1
- php: 7.2
- php: 7.3
- php: nightly
- php: hhvm
dist: trusty
4 changes: 2 additions & 2 deletions examples/DKIM_sign.phps
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ $mail->DKIM_passphrase = '';
//The identity you're signing as - usually your From address
$mail->DKIM_identity = $mail->From;
//Suppress listing signed header fields in signature, defaults to true for debugging purpose
$this->mailer->DKIM_copyHeaderFields = false;
$mail->DKIM_copyHeaderFields = false;
//Optionally you can add extra headers for signing to meet special requirements
$this->mailer->DKIM_extraHeaders = ['List-Unsubscribe', 'List-Help'];
$mail->DKIM_extraHeaders = ['List-Unsubscribe', 'List-Help'];

//When you send, the DKIM settings will be used to sign the message
if (!$mail->send()) {
Expand Down
2 changes: 1 addition & 1 deletion language/phpmailer.lang-uk.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@
$PHPMAILER_LANG['smtp_connect_failed'] = 'Помилка з\'єднання із SMTP-сервером';
$PHPMAILER_LANG['smtp_error'] = 'Помилка SMTP-сервера: ';
$PHPMAILER_LANG['variable_set'] = 'Неможливо встановити або перевстановити змінну: ';
//$PHPMAILER_LANG['extension_missing'] = 'Extension missing: ';
$PHPMAILER_LANG['extension_missing'] = 'Не знайдено розширення: ';

0 comments on commit cb4e2ae

Please sign in to comment.