Merge branch 'master' of https://github.com/PHPMailer/PHPMailer

2016-09-17 10:48:35 -04:00 · 2016-09-17 10:48:35 -04:00 · fd9501ce66
parent cd899c7696 ebfe89a82d
commit fd9501ce66
6 changed files with 4 additions and 0 deletions
--- a/SECURITY.md
+++ b/SECURITY.md
--- a/class.phpmailer.php
+++ b/class.phpmailer.php
@ -1683,7 +1683,11 @@ class PHPMailer
    {
        // Backwards compatibility for renamed language codes
        $renamed_langcodes = array(
+            'br' => 'pt_br',
+            'cz' => 'cs',
            'dk' => 'da',
+            'no' => 'nb',
+            'se' => 'sv',
        );

        if (isset($renamed_langcodes[$langcode])) {
--- a/language/phpmailer.lang-cs.php
+++ b/language/phpmailer.lang-cs.php
--- a/language/phpmailer.lang-nb.php
+++ b/language/phpmailer.lang-nb.php
--- a/language/phpmailer.lang-pt_br.php
+++ b/language/phpmailer.lang-pt_br.php
--- a/language/phpmailer.lang-sv.php
+++ b/language/phpmailer.lang-sv.php