From 8f558ec0535c1fc348fd8c2c3c80de55dbc1f94d Mon Sep 17 00:00:00 2001 From: Wyatt O'Day Date: Wed, 26 Sep 2018 12:46:46 -0400 Subject: [PATCH 1/3] Fix warning under PHP 7.3.x+: filter_var(): explicit use of FILTER_FLAG_SCHEME_REQUIRED and FILTER_FLAG_HOST_REQUIRED is deprecated. (#1551) FILTER_VALIDATE_URL already checks the host, thus no need to explicitly pass FILTER_FLAG_HOST_REQUIRED (hence the warning). --- src/PHPMailer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/PHPMailer.php b/src/PHPMailer.php index 07466a49..047d43f4 100644 --- a/src/PHPMailer.php +++ b/src/PHPMailer.php @@ -3628,7 +3628,7 @@ class PHPMailer //Is it a valid IPv4 address? return (bool) filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4); } - if (filter_var('http://' . $host, FILTER_VALIDATE_URL, FILTER_FLAG_HOST_REQUIRED)) { + if (filter_var('http://' . $host, FILTER_VALIDATE_URL)) { //Is it a syntactically valid hostname? return true; } From 9e81b00c2fb87cf32978eb053ef5eddaaa483c19 Mon Sep 17 00:00:00 2001 From: Marcus Bointon Date: Wed, 26 Sep 2018 19:39:29 +0200 Subject: [PATCH 2/3] Add BC fix for renamed Tagalog language --- src/PHPMailer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/PHPMailer.php b/src/PHPMailer.php index 047d43f4..93b8ff1b 100644 --- a/src/PHPMailer.php +++ b/src/PHPMailer.php @@ -1996,6 +1996,7 @@ class PHPMailer 'no' => 'nb', 'se' => 'sv', 'sr' => 'rs', + 'tg' => 'tl', ]; if (isset($renamed_langcodes[$langcode])) { From 18dbc75792134d9f7d93722da3c4a84df010662c Mon Sep 17 00:00:00 2001 From: Marcus Bointon Date: Wed, 26 Sep 2018 19:40:58 +0200 Subject: [PATCH 3/3] Changelog --- changelog.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changelog.md b/changelog.md index 697f7a14..a9e31d90 100644 --- a/changelog.md +++ b/changelog.md @@ -3,9 +3,14 @@ * Added Tagalog translation, thanks to @StoneArtz * Updated Hungarian translations * Updated Dutch translations +* Updated Slovenian translation (@filips123) +* Updated Italian translation (@sabas) +* Updated Norwegian translation (@aleskr) +* Updated Indonesian translation (@mylastof) * Add constants for common values, such as `text/html` and `quoted-printable`, and use them * Added support for copied headers in DKIM, helping with debugging, and an option to add extra headers to the DKIM signature. See DKIM_sign example for how to use them. Thanks to @gwi-mmuths. * Add Campaign Monitor transaction ID pattern matcher +* Remove deprecated constant and ini values causing warnings in PHP 7.3. ## Version 6.0.5 (March 27th 2018) * Re-roll of 6.0.4 to fix missed version file entry. No code changes.