1170 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Marcus Bointon	01264ebf31	Take function call out of loop	2017-07-28 10:46:56 +02:00
Marcus Bointon	3eb9e8b47a	Don't try to output possibly non-existent elements	2017-07-27 00:00:46 +02:00
Marcus Bointon	ca9f6c2d57	Avoid XSS in error message output	2017-07-26 23:16:08 +02:00
Marcus Bointon	1e3f4e4062	Merge remote-tracking branch 'remotes/origin/master' into 6.0 ... # Conflicts: # VERSION # changelog.md # examples/code_generator.phps # src/PHPMailer.php # src/POP3.php # src/SMTP.php # test/phpmailerTest.php	2017-07-26 23:10:42 +02:00
Marcus Bointon	22d04c6a58	5.2.24	2017-07-26 23:00:20 +02:00
Marcus Bointon	4f6449ecfa	Add fix for IPv6 literals in multiple host strings, see #1094	2017-07-26 22:52:29 +02:00
Marcus Bointon	cb2be11013	Add failing test for #1094 ... Exercise more bad host checks	2017-07-26 22:51:02 +02:00
Marcus Bointon	1194d56e92	Correct Serbian ISO language code from sr to rs	2017-07-26 22:09:06 +02:00
Marcus Bointon	d46ba2d186	Fix potential XSS vuln in debug output	2017-07-26 20:03:27 +02:00
Marcus Bointon	dbbc1397c4	Fix XSS vuln in example code: CVE-2017-11503	2017-07-26 20:02:31 +02:00
Marcus Bointon	c899ba203f	Remove code generator example - too messy!	2017-07-26 19:54:31 +02:00
Marcus Bointon	6bf4b5a187	Consistent alternative regex delimiter	2017-07-26 11:05:43 +02:00
Marcus Bointon	c64609ad07	Comment cleanup	2017-07-26 11:05:10 +02:00
Marcus Bointon	84717cdd4e	Don't need this doc	2017-07-26 11:04:20 +02:00
Marcus Bointon	9e4f68b6b0	Restrict zend_i18n to PHP 5.5 compat version	2017-06-29 21:55:28 +02:00
Marcus Bointon	d8880934f5	No empty parens on new	2017-06-29 21:54:47 +02:00
Marcus Bointon	589b09fce5	Remove trailing commas	2017-06-29 21:54:09 +02:00
Marcus Bointon	1f6c876d5e	Avoid old aliases ... Use short array syntax	2017-06-29 20:52:54 +02:00
Marcus Bointon	6d7c66df9e	Return value directly	2017-06-29 20:42:22 +02:00
Marcus Bointon	97e95ab154	Avoid embedded assignment	2017-06-29 20:21:35 +02:00
Marcus Bointon	6121caf09a	Remove common alternatives	2017-06-29 20:14:11 +02:00
Marcus Bointon	9ed764ecbf	Prefer pre-increment	2017-06-29 19:57:38 +02:00
Marcus Bointon	618f998286	Prefer short operators	2017-06-29 19:56:19 +02:00
Marcus Bointon	48dd88a70e	Remove unnecessary parens	2017-06-29 19:49:19 +02:00
Marcus Bointon	9111e36438	Avoid embedded assignment	2017-06-29 19:39:06 +02:00
Marcus Bointon	94e1d25572	Avoid embedded assignment	2017-06-29 19:36:06 +02:00
Marcus Bointon	4125778dd9	Call validate statically	2017-06-29 19:15:53 +02:00
Marcus Bointon	f12f42009a	Merge remote-tracking branch 'origin/6.0' into 6.0	2017-06-23 10:29:14 +02:00
Marcus Bointon	cf868cd588	Upgrade dev deps	2017-06-22 18:50:04 +02:00
Marcus Bointon	424398579d	Merge changes from master	2017-06-22 18:36:56 +02:00
Marcus Bointon	c35694d65f	Merge remote-tracking branch 'origin/master'	2017-06-21 14:00:22 +02:00
Marcus Bointon	ffb6be138d	Add dates in history	2017-06-21 14:00:05 +02:00
Marcus Bointon	f26ca5279e	Remove v5 issue_template	2017-06-14 14:53:33 +02:00
Marcus Bointon	b60c8df85e	Merge remote-tracking branch 'remotes/upstream/master' into 6.0	2017-06-14 14:49:06 +02:00
Marcus Bointon	7ee66b9b39	Move issue_template to .github folder	2017-06-14 14:48:50 +02:00
Marcus Bointon	45fee1c2b4	Tweak issue_template	2017-06-14 14:46:09 +02:00
Manzoor Wani	29b2042fd1	Correct the attribute description (#1073) ... doCallback() receives $to, $cc and $bcc as arrays and passes them as such to the action function	2017-06-13 13:59:32 +02:00
Teddysun	699d57dc01	Improved Simplified Chinese PHPMailer language (#1063) ... Completed new language key $PHPMAILER_LANG['extension_missing']. Signed-off-by: Teddysun <i@teddysun.com>	2017-05-31 06:26:14 +01:00
Marcus Bointon	b3febb7df4	typo	2017-05-29 16:25:41 +02:00
Marcus Bointon	9e548ffaf7	Merge remote-tracking branch 'remotes/origin/master' into 6.0	2017-05-29 14:07:35 +02:00
Marcus Bointon	cd2f977899	Allow injecting an SMTP instance	2017-05-29 14:07:11 +02:00
Marcus Bointon	4896adc0a1	Changelog	2017-05-29 08:55:06 +02:00
Ogün Karakuş	a255f16a0e	Update phpmailer.lang-tr.php (#1060) ... Signed-off-by: Ogün Karakuş <kirk5bucuk@gmail.com>	2017-05-29 07:24:35 +01:00
Marcus Bointon	262dc4997a	Merge remote-tracking branch 'remotes/origin/master' into 6.0	2017-05-26 12:09:15 +02:00
Marcus Bointon	b25f93eb2d	More reliable folding of message headers	2017-05-22 18:53:00 +02:00
Niklas	c2f17ba471	Markdown needs a space between #:s and the heading (#1054)	2017-05-22 14:16:25 +01:00
Marcus Bointon	d95ef498e2	Trim subject consistently	2017-05-22 10:13:28 +02:00
Marcus Bointon	eb96b30775	Speak Yoda	2017-05-22 10:08:37 +02:00
Marcus Bointon	799a156ea7	Speak Yoda	2017-05-22 09:48:23 +02:00
Marcus Bointon	7c6ce49757	Remove duplicate mbstring check	2017-05-22 09:38:56 +02:00