From 29f48d454e12ed933cd6c4cacce03d72e4c71f45 Mon Sep 17 00:00:00 2001 From: SirLouen Date: Tue, 30 Sep 2025 13:21:53 +0200 Subject: [PATCH] Regressing deprecatedArg --- language/phpmailer.lang-es.php | 2 +- src/PHPMailer.php | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/language/phpmailer.lang-es.php b/language/phpmailer.lang-es.php index c845d129..a871824f 100644 --- a/language/phpmailer.lang-es.php +++ b/language/phpmailer.lang-es.php @@ -35,4 +35,4 @@ $PHPMAILER_LANG['smtp_detail'] = 'Detalle: '; $PHPMAILER_LANG['smtp_error'] = 'Error del servidor SMTP: '; $PHPMAILER_LANG['variable_set'] = 'No se pudo configurar la variable: '; $PHPMAILER_LANG['imap_recommended'] = 'No se recomienda usar el analizador de direcciones simplificado. Instala la extensión IMAP de PHP para un análisis RFC822 más completo.'; -$PHPMAILER_LANG['deprecated_argument'] = 'El argumento $deprecatedArg ha quedado obsoleto'; +$PHPMAILER_LANG['deprecated_argument'] = 'El argumento $useimap ha quedado obsoleto'; diff --git a/src/PHPMailer.php b/src/PHPMailer.php index 865f3a4e..6e83790e 100644 --- a/src/PHPMailer.php +++ b/src/PHPMailer.php @@ -1241,15 +1241,15 @@ class PHPMailer * * @see https://www.andrew.cmu.edu/user/agreen1/testing/mrbs/web/Mail/RFC822.php A more careful implementation * - * @param string $addrstr The address list string - * @param string|null $deprecatedArg Deprecated argument since 6.11.0. - * @param string $charset The charset to use when decoding the address list string. + * @param string $addrstr The address list string + * @param null $useimap Deprecated argument since 6.11.0. + * @param string $charset The charset to use when decoding the address list string. * * @return array */ - public static function parseAddresses($addrstr, $deprecatedArg = null, $charset = self::CHARSET_ISO88591) + public static function parseAddresses($addrstr, $useimap = null, $charset = self::CHARSET_ISO88591) { - if ($deprecatedArg !== null) { + if ($useimap !== null) { trigger_error(self::lang('deprecated_argument'), E_USER_DEPRECATED); } $addresses = []; @@ -2482,7 +2482,7 @@ class PHPMailer 'no_smtputf8' => 'Server does not support SMTPUTF8 needed to send to Unicode addresses', 'imap_recommended' => 'Using simplified address parser is not recommended. ' . 'Install the PHP IMAP extension for full RFC822 parsing.', - 'deprecated_argument' => 'Argument $deprecatedArg is deprecated', + 'deprecated_argument' => 'Argument $useimap is deprecated', ]; if (empty($lang_path)) { //Calculate an absolute path so it can work if CWD is not here