mirror
/
PHPMailer
mirror of https://github.com/PHPMailer/PHPMailer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3241 from SirLouen/patch/3201v3 

Improving docs and translations for deprecated useimap
This commit is contained in:
Marcus Bointon 2025-09-30 17:28:50 +02:00 committed by GitHub
parent d9e3b36b47 a26214d5a3
commit 5acdb20adf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
language/phpmailer.lang-es.php
View File

@ -35,4 +35,4 @@ $PHPMAILER_LANG['smtp_detail'] = 'Detalle: ';
$PHPMAILER_LANG['smtp_error'] = 'Error del servidor SMTP: '; $PHPMAILER_LANG['smtp_error'] = 'Error del servidor SMTP: ';
$PHPMAILER_LANG['variable_set'] = 'No se pudo configurar la variable: '; $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['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: ';

8
src/PHPMailer.php
View File

@ -1242,7 +1242,9 @@ class PHPMailer
* @see https://www.andrew.cmu.edu/user/agreen1/testing/mrbs/web/Mail/RFC822.php A more careful implementation * @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 $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. * @param string $charset The charset to use when decoding the address list string.
* *
* @return array * @return array
@ -1250,7 +1252,7 @@ class PHPMailer
public static function parseAddresses($addrstr, $useimap = null, $charset = self::CHARSET_ISO88591) public static function parseAddresses($addrstr, $useimap = null, $charset = self::CHARSET_ISO88591)
{ {
if ($useimap !== null) { if ($useimap !== null) {
trigger_error(self::lang('deprecated_argument'), E_USER_DEPRECATED); trigger_error(self::lang('deprecated_argument') . '$useimap', E_USER_DEPRECATED);
} }
$addresses = []; $addresses = [];
if (function_exists('imap_rfc822_parse_adrlist')) { 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', 'no_smtputf8' => 'Server does not support SMTPUTF8 needed to send to Unicode addresses',
'imap_recommended' => 'Using simplified address parser is not recommended. ' . 'imap_recommended' => 'Using simplified address parser is not recommended. ' .
'Install the PHP IMAP extension for full RFC822 parsing.', 'Install the PHP IMAP extension for full RFC822 parsing.',
'deprecated_argument' => 'Argument $useimap is deprecated', 'deprecated_argument' => 'Deprecated Argument: ',
]; ];
if (empty($lang_path)) { if (empty($lang_path)) {
//Calculate an absolute path so it can work if CWD is not here //Calculate an absolute path so it can work if CWD is not here