diff --git a/language/phpmailer.lang-es.php b/language/phpmailer.lang-es.php index a871824f..e6a3d85e 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 $useimap ha quedado obsoleto'; +$PHPMAILER_LANG['deprecated_argument'] = 'Argumento obsoleto: '; diff --git a/src/PHPMailer.php b/src/PHPMailer.php index 0a8711f4..11d57ab5 100644 --- a/src/PHPMailer.php +++ b/src/PHPMailer.php @@ -1242,7 +1242,9 @@ 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 null $useimap Deprecated argument since 6.11.0. + * @param null $useimap Unused. Argument has been deprecated in PHPMailer 6.11.0. + * Previously this argument determined whether to use + * the IMAP extension to parse the list and accepted a boolean value. * @param string $charset The charset to use when decoding the address list string. * * @return array @@ -1250,7 +1252,7 @@ class PHPMailer public static function parseAddresses($addrstr, $useimap = null, $charset = self::CHARSET_ISO88591) { if ($useimap !== null) { - trigger_error(self::lang('deprecated_argument'), E_USER_DEPRECATED); + trigger_error(self::lang('deprecated_argument') . '$useimap', E_USER_DEPRECATED); } $addresses = []; if (function_exists('imap_rfc822_parse_adrlist')) { @@ -2482,7 +2484,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 $useimap is deprecated', + 'deprecated_argument' => 'Deprecated Argument: ', ]; if (empty($lang_path)) { //Calculate an absolute path so it can work if CWD is not here