Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don’t worry, you can still create the pull request.
This comparison is big! We’re only showing the most recent 250 commits
Commits on Oct 15, 2014
@Synchro Synchro Allow some legacy coding practices since there's nothing we can do ab…
…out them
d422dd9
@Synchro Synchro Fix short var name for scrutinizer 09d40c4
Commits on Oct 23, 2014
@Synchro Synchro Merge pull request #302 from mirjalal/master
Azerbaijani translation
2000bbb
Commits on Oct 24, 2014
@mirjalal mirjalal Azerbaijani transilation 80169a4
Commits on Oct 31, 2014
@martinvd martinvd Dutch translation fix 3e0d299
@Synchro Synchro Merge pull request #305 from martinvd/patch-1
Dutch translation fix
92b445d
Commits on Nov 03, 2014
@Synchro Synchro Avoid convoluted syntax
Use more robust comparisons, be more forgiving where it's not important
Don't assume temp file writing worked
5afb552
Commits on Nov 06, 2014
@ceceprawiro ceceprawiro Indonesian translation 311c957
@Synchro Synchro Changelog df23c21
@Synchro Synchro Update scrutinizer config 479968f
@Synchro Synchro Update scrutinizer config 63a6397
@Synchro Synchro Update scrutinizer config 93e422e
@ceceprawiro ceceprawiro Indonesia translation a79adea
@Synchro Synchro Remove BOM from az language file 1594dcc
@Synchro Synchro Update scrutinizer config d066daa
@Synchro Synchro Avoid Debugoutput clash with built-in function names, fixes #308 d6acd1c
@Synchro Synchro Avoid Debugoutput clash with built-in function names, fixes #308 3535327
@Synchro Synchro Merge pull request #307 from ceceprawiro/master
Indonesian translation
cf35927
@Synchro Synchro Changelog 6d67358
@Synchro Synchro Update README 85c7c6b
Commits on Nov 08, 2014
@heronman heronman SMTP extended error codes stored in $smtp->error 8d2961a
@heronman heronman Added HELO/EHLO reply parsing. Corresponding get methods: getServerEx…
…tensions(), getAuthAllowed(), getTLSAllowed()
b45f563
@heronman heronman Auth method selection added, according to STMP extensions list 542c479
Commits on Nov 09, 2014
@heronman heronman A little bugfix 51b1fe2
@Synchro Synchro Update NTLM SASL lib
 This is still pretty old, bad code, and I think it's incomplete, and I don't have an NTLM system to test against. Should probably be removed.
9d0a394
@Synchro Synchro Fix SM image 740780d
Commits on Nov 10, 2014
@heronman heronman $helo_rply recovered. SMTP extension methods reconsidered (refer to c…
…omment)
25859d3
Commits on Nov 13, 2014
@Synchro Synchro Merge pull request #311 from heronman/master
A bugfix in SMTP::authenticate, plus some improvements
b73954f
@Synchro Synchro Code cleanup e6f70f1
@Synchro Synchro Changelog 009538f
@Synchro Synchro Cleanup de5c035
Commits on Nov 14, 2014
@Synchro Synchro Deal with excessively long lines, see #314 aa8e499
Commits on Nov 21, 2014
@gergoe gergoe Fixing an issue with embedded images
Fixed the issue with html parsing when there was an embedded base64
encoded image in the source - which resulted in regexp errors (too long
regexp).
157547a
@gergoe gergoe changed white spaces 76a67bc
@Synchro Synchro Merge pull request #319 from gergoe/master
Fixing an issue with embedded images
70930a6
@hemmerich hemmerich Update class.smtp.php
Not all SMTP servers will provide a value for SIZE. This commit checks to be certain there is an element in the array before attempting to access it.
9553002
@hemmerich hemmerich Update class.smtp.php
Set the value to 0 if the fields array is empty
1ec37ad
Commits on Nov 24, 2014
@Synchro Synchro Merge pull request #320 from hemmerich/patch-1
Update class.smtp.php
58c862c
@landsem landsem Fixed some language 3816957
Commits on Dec 06, 2014
@Synchro Synchro Don't set WordWrap in readme example, add comments about usage includ…
…ing 78 as a good value to use, fixes #327
fedb948
@Synchro Synchro Don't set WordWrap in readme example, add comments about usage includ…
…ing 78 as a good value to use, fixes #327
ba4ece8
@Synchro Synchro Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 4a46a82
@Synchro Synchro Make tests a bit less verbose b7f1dd1
Commits on Dec 17, 2014
@Synchro Synchro Remove 'advanced' html2text converter to resolve license clash, fixes #…
…232

Allow injection of custom html2text converter, amend tests to cover it
Update README and related docs
127d26e
@Synchro Synchro Remove stray license file 851da29
Commits on Dec 22, 2014
@natoshi natoshi Removed duplicate line
The if statement would check if the DKIM_domain is empty two times.
1bf5877
@Synchro Synchro Merge pull request #333 from natoshi/patch-1
Removed duplicate line
df2a282
Commits on Dec 24, 2014
@Synchro Synchro Add example of sending a file upload cee5e9b
@Synchro Synchro Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 548aa26
Commits on Dec 25, 2014
@alfupe alfupe Update phpmailer.lang-es.php
Edited in a more fluent Spanish
67cc928
Commits on Dec 26, 2014
@Synchro Synchro Merge pull request #336 from alfupe/patch-1
Update phpmailer.lang-es.php
cb22df1
Commits on Dec 28, 2014
@jimjag jimjag updates for add't tests and PSR2 afa80c5
@jimjag jimjag typo on PSR2 dcf5bf6
Commits on Jan 02, 2015
@SDKiller SDKiller Fixed callable call
Otherwise in case of autoloading classes with `composer` -  `Call to undefined function` error 
(thow `var_dump(is_callable($advanced))` returns `true` !)
a89724a
@Synchro Synchro Merge pull request #342 from SDKiller/patch-1
Fixed callable call
bda4179
Commits on Jan 05, 2015
@Synchro Synchro Use autoloader ecce82a
Commits on Jan 09, 2015
@Synchro Synchro Reformat code to PSR-2 standard 65784d1
@Synchro Synchro Refactor and major cleanup of EasyPeasyICS, including a fix for #338 4309101
@Synchro Synchro Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 34b33d9
@Synchro Synchro Up PHPUnit dep to 4.3 7b66825
Commits on Jan 28, 2015
@Synchro Synchro Fix inappropriate checks in set(), make more reliable c00fdf7
Commits on Feb 02, 2015
@nawawi nawawi malaysian translation 9abd78e
@Synchro Synchro Merge pull request #352 from nawawi/master
malaysian translation
73ef61b
@Synchro Synchro Changelog 5862562
@Synchro Synchro Cleanup 80c6258
Commits on Feb 04, 2015
@mialy mialy Bulgarian translation 4989a9b
@Synchro Synchro Merge pull request #355 from mialy/bulgarian
Bulgarian translation
ad3934b
@Synchro Synchro Changelog 6fb0f62
Commits on Feb 17, 2015
@Synchro Synchro Add Armenian translation 40fa68e
Commits on Feb 25, 2015
@Synchro Synchro Add Slovene translation 7530ff8
Commits on Feb 26, 2015
@Synchro Synchro Make phpcs happier 2dc47a8
Commits on Mar 02, 2015
@Synchro Synchro Fix incorrect MIME structure when signing with S/MIME and sending wit…
…h isMail, see #372
2257643
@Synchro Synchro explode, set headers e16b86b
@TomasVotruba TomasVotruba travis: PHP 7.0 nightly added
+ syntax fix to 2 spaces
cb2d3cb
Commits on Mar 03, 2015
@Synchro Synchro Merge pull request #373 from TomasVotruba/patch-1
travis: PHP 7.0 nightly added
7fe040d
Commits on Mar 04, 2015
@Synchro Synchro Scrutinizer fix 19c0651
@Synchro Synchro Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 93c8cd0
@Synchro Synchro More efficient, more readable loops in wrapText
Add multibyte wordwrap test
phpDoc cleanup in tests
541cfec
@Synchro Synchro changelog 073bf14
@Synchro Synchro changelog de664ae
@Synchro Synchro Clean up indenting ec9148b
Commits on Mar 05, 2015
@Synchro Synchro Avoid ternary statements
Use boolean values consistently for magic_quotes settings
ec94520
Commits on Mar 06, 2015
@Synchro Synchro Add support for additional CA certificate when S/MIME signing, fixes #… c506185
@Synchro Synchro Changelog 3e3617d
@Synchro Synchro Merge branch 'master' into mimesign d17e641
@Synchro Synchro Workaround for PHP bug https://bugs.php.net/bug.php?id=69197 d89d3b0
@Synchro Synchro Merge branch 'master' into mimesign 16aba04
@Synchro Synchro Cleaner check for no server caps 27cc552
@Synchro Synchro Merge branch 'master' into mimesign 91c5a60
Commits on Mar 16, 2015
@Synchro Synchro Improve reporting of missing OpenSSL extension for SSl and TLS, see #378


Add 'missing extension' language string
Improve default handling of language strings
4680d1f
@Synchro Synchro typo 1ad1217
@Synchro Synchro Add tests for line breaks in headers, see #372
Minor cleanup
d7c44d5
@Synchro Synchro Changelog d1c43fe
@kanellov kanellov Fix some errors. 9c63df3
@Synchro Synchro Merge pull request #379 from kanellov/fix/greek-translation
Update greek translation
795c904
Commits on Mar 17, 2015
@Synchro Synchro Add MIME preamble to all multipart message types, should fix #316
Tidy up format of test messages
c8be949
@Synchro Synchro Tidy up format of test messages 3bdaa17
Commits on Mar 18, 2015
@Synchro Synchro Tidy up format of test messages 78f323d
Commits on Mar 19, 2015
@Synchro Synchro Make SMTP error storage and reporting more consistent, fixes #382 3ea8425
@Synchro Synchro Merge branch 'master' of https://github.com/PHPMailer/PHPMailer into …
…mimesign

# Conflicts:
#	changelog.md
b02b573
Commits on Mar 20, 2015
@Synchro Synchro Tweak MIME preamble
Test output cleanup
c39b89f
@Synchro Synchro Add UTF-8 tests 08f7807
@Synchro Synchro Merge remote-tracking branch 'remotes/upstream/master' into longlines
# Conflicts:
#	class.phpmailer.php
#	test/phpmailerTest.php
6e444ac
@Synchro Synchro Fix unique id / boundary problems when creating body before header
Add tests for line length transfer encoding override
a071e68
Commits on Mar 21, 2015
@Synchro Synchro Armenian update (Thanks to Hrayr Grigoryan) 5482750
@ivantcholakov ivantcholakov Bulgarian language update. a303621
Commits on Mar 22, 2015
@Synchro Synchro Merge pull request #383 from ivantcholakov/bulgarian
Bulgarian language update.
95bd39a
Commits on Mar 25, 2015
@Synchro Synchro Enable TLS automatically if the server offers it, with an option to d…
…isable it
9da56fc
@Synchro Synchro Changelog 07176c0
@Synchro Synchro Provide detailed errors when sending to individual recipients fails 947415c
@Synchro Synchro Use multibyte text in tests
Add explicit test for UTF-8 with embedded images, see #279 and #377
Add ISO-8859-1 test
50eac87
Commits on Mar 28, 2015
@royopa royopa Added poser badges 81418e0
Commits on Mar 29, 2015
@Synchro Synchro Merge pull request #388 from royopa/patch-1
Added poser badges
580e44d
Commits on Apr 04, 2015
@sveneld sveneld Update class.phpmailer.php
Fix concatenation of headers for Dkim
30a5c73
@sveneld sveneld Update class.phpmailer.php 653d638
@Synchro Synchro Merge pull request #393 from sveneld/patch-1
Fix concatenation of headers for Dkim
efd1558
Commits on Apr 13, 2015
@Phhere Phhere Update class.pop3.php
Small fix in php doc about parameter types. Since it is just a wrapper for authorise it should accept the same parameter types
1188e2e
@Synchro Synchro Merge pull request #398 from Phhere/patch-1
Documentation update class.pop3.php
df93ba1
@Synchro Synchro Merge pull request #322 from landsem/patch-1
Fixed some language
333e3e6
Commits on Apr 14, 2015
@Synchro Synchro Fix param naming, see #398 166ce3b
Commits on Apr 17, 2015
@Synchro Synchro Improve connection error reporting 3c29d75
@pstast pstast Fix $all_recipients comment
$all_recipients does not contain $replyto addresses, see addAnAddress() behavior
c2535c9
@Synchro Synchro Merge pull request #399 from pstast/PHPMailer/master
Fix $all_recipients comment
f32ba62
@Synchro Synchro Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 2ffc3df
@Synchro Synchro Changelog 245d73b
@Synchro Synchro Merge remote-tracking branch 'remotes/upstream/master' into longlines b83f2a6
@Synchro Synchro Merge remote-tracking branch 'remotes/upstream/master' into longlines 1365c49
@Synchro Synchro Merge remote-tracking branch 'remotes/upstream/master' into autotls
# Conflicts:
#	changelog.md
e427427
Commits on Apr 23, 2015
@Synchro Synchro Add extras classes to composer classmap 095193b
@eexit eexit Added custom header getter 47fd54d
@Synchro Synchro Merge pull request #405 from eexit/header-getter
Add custom header getter
65e6f5a
@Synchro Synchro Fix file attachment test 89bb0d6
Commits on Apr 26, 2015
@ChalkPE ChalkPE Added Korean language file 1d4e289
@Synchro Synchro Merge pull request #406 from ChalkPE/master
Added Korean language file
9bb6a28
Commits on Apr 27, 2015
@Synchro Synchro Expose stream context options ab36b53
Commits on Apr 29, 2015
@Synchro Synchro Merge remote-tracking branch 'remotes/upstream/longlines' 4e8a80a
@Synchro Synchro Changelog, phpdocs f23b954
@Synchro Synchro Name 5.2.10 release a6cd574
@Synchro Synchro Merge remote-tracking branch 'remotes/upstream/master' into autotls 1befef0
@Synchro Synchro Changelog 0001e64
@Synchro Synchro Readme 0635bf6
@Synchro Synchro Corrections to ISO text test
Only test ICS configs that are actually supported!
Fix missing headers when using signed messages
9164e6d
@Synchro Synchro Fix broken URL 5701fa3
@Synchro Synchro Fix download counter c78ba0c
Commits on Apr 30, 2015
@Synchro Synchro Don't change charset when changing transfer encoding b3577cf
Commits on May 04, 2015
@Cojad Cojad Improved Traditional Chinese PHPMailer language
1. Completed new language key $PHPMAILER_LANG['extension_missing']. 
2. fix translation error of $PHPMAILER_LANG['signing'] with correct meaning in Traditional Chinese 
3. Re-order the translation keys to make it the same with default english locale.
cf35018
@Synchro Synchro Merge pull request #411 from Cojad/master
Improved Traditional Chinese PHPMailer language
53dbfbd
@Synchro Synchro Add multiple attachment test c7e488d
@Synchro Synchro Provide a link to troubleshooting docs on SMTP failure da70308
@Synchro Synchro Merge branch 'master' of https://github.com/PHPMailer/PHPMailer 35bb2f0
@Synchro Synchro Bump version to 5.2.10 07005ec
Commits on May 05, 2015
@Synchro Synchro Don't switch to quoted-printable to deal with long lines if encoding …
…is already base64. Fixes #414
9269a65
Commits on May 06, 2015
@Synchro Synchro Fix 'licenced' b2be749
@Synchro Synchro Remove deprecated PHPUnit param 707e850
@Synchro Synchro Probe travis config 1f01bb3
@Synchro Synchro Probe travis config 409fa96
@Synchro Synchro Alternative way of getting path to ini files f2b21f0
@Synchro Synchro Annoying yaml escaping 74c172b
@Synchro Synchro Annoying yaml escaping 5a6cab2
@Synchro Synchro Annoying yaml escaping a505182
@Synchro Synchro Clean up 3e5a200
@Synchro Synchro Fix travis config for PHP 7 adea5c6
Commits on May 08, 2015
@DavidPrevot DavidPrevot Drop useless executable bit 89d68a6
Commits on May 11, 2015
@Synchro Synchro Merge pull request #416 from DavidPrevot/executable
Drop useless executable bit
d2b8b99
Commits on May 19, 2015
@sherryl4george sherryl4george XOAUTH Changes b4cf92e
@Synchro Synchro Code cleanups e874b2a
@Synchro Synchro Changelog & Readme 8736a45
Commits on May 20, 2015
@Synchro Synchro Docs ed41c83
Commits on May 21, 2015
@Synchro Synchro Changed AuthType name to 'XOAUTH2'
Tested, fixed examples
Improved token script
Code cleanup
d24a921
@Synchro Synchro Add address parser, fixes #82, #145 199bd96
@Synchro Synchro Merge remote-tracking branch 'upstream/master' into sherryl4george-xo…
…auth

# Conflicts:
#	changelog.md
0d1f35f
Commits on Jun 03, 2015
@Synchro Synchro Correct oauth property names 916ba4b
@Synchro Synchro Don't echo oauthUserEmail f0e5bf8
Commits on Jun 13, 2015
@Synchro Synchro Update MS Office MIME types de90c4a
@Synchro Synchro Update MS Office MIME types 9cbd8bf
Commits on Jun 29, 2015
@chriscct7 chriscct7 Wordpress -> WordPress 70af7cc
@Synchro Synchro Merge pull request #446 from chriscct7/patch-1
Wordpress -> WordPress
94a0233
@mrbellek mrbellek do not auto-replace inline images in body that are already replaced 552a0c6
@mrbellek mrbellek amend last commit 2722cc1
@Synchro Synchro Don't set Priority header by default, fixes #449 5c19601
Commits on Jun 30, 2015
@mrbellek mrbellek fixed typo, condition order a54c92c
Commits on Jul 01, 2015
@hrvoj3e hrvoj3e Updated string 'extension_missing' e1a8b1b
@Synchro Synchro Merge pull request #450 from hrvoj3e/patch-2
Updated string 'extension_missing'
db33c00
Commits on Jul 07, 2015
@Synchro Synchro Update deps 3bcec07
Commits on Jul 14, 2015
@royopa royopa addex how to install with composer a378ec7
Commits on Jul 15, 2015
@royopa royopa addex how to install with composer in command line 49e9f65
@Synchro Synchro Merge pull request #458 from royopa/patch-3
addex how to install with composer in command line
c99f3dd
Commits on Jul 17, 2015
@freephile freephile Update gmail.phps
The internet is littered with people trying to figure out why PHPMailer doesn't work for them with GMail.  ISPs like Digital Ocean do not support SMTP traffic over IPv6, but Google is IPv6 ready so PHPMailer waits a long time trying that before it tries IPv4.  That wait is either a major bottleneck, or a failure point as execution timeouts come into play.
See https://www.digitalocean.com/community/questions/outgoing-connections-on-port-25-587-143-blocked-over-ipv6
and
https://stackoverflow.com/questions/20068484/phpmailer-using-gmail-smtp-slow-when-sending-emails for example
c1c20f2
@Synchro Synchro Merge pull request #460 from freephile/patch-1
Update gmail.phps
a473326
Commits on Jul 22, 2015
@Rebelllious Rebelllious Update phpmailer.lang-uk.php
Minor mistakes fixed.
86df0bf
@Synchro Synchro Merge pull request #461 from Rebelllious/patch-1
Update phpmailer.lang-uk.php
1193eb9
Commits on Aug 01, 2015
@Synchro Synchro Don't normalise line breaks when QP-encoding, fixes #464 6f266a2
@Synchro Synchro Merge remote-tracking branch 'upstream/master' fd1eba2
@Synchro Synchro Changelog 0639590
@Synchro Synchro Handle MS Exchange returning invalid empty AUTH type list, fixes #462 41d7273
Commits on Aug 07, 2015
@Synchro Synchro Reduce duplicate debug output 8a71910
@Synchro Synchro Merge branch 'master' of ssh://github.com/PHPMailer/PHPMailer 46ef34b
Commits on Aug 22, 2015
Wolfgang Jentner Added an example file explaining how to send signed emails b8fdec8
@Synchro Synchro Merge pull request #477 from sisu4u/smime-example
Added an example file explaining how to send signed emails
f90669c
Commits on Aug 25, 2015
@Synchro Synchro Fix issues with embedding items without filenames, fixes #478 c93759d
@Synchro Synchro Merge remote-tracking branch 'upstream/master' a8fb10c
@Synchro Synchro Changelog 58a6a5c
@Synchro Synchro Merge remote-tracking branch 'remotes/upstream/master' into xoauth 57d3d1f
Commits on Aug 31, 2015
@Synchro Synchro Bump version to 5.2.11 7830cb9
Commits on Sep 02, 2015
@Synchro Synchro Merge pull request #457 from royopa/patch-2
added how to install with composer
b4a7c71
@Synchro Synchro Merge pull request #447 from mrbellek/master
do not auto-replace inline images in body that are already replaced
bf7059c
@frederikbosch frederikbosch Do no require a dependency that is not required
First of all, do not require dependencies that are not required for PHPMailer to work. It works perfectly without. Secondly, the majority of the users will not use Gmail's XOAUTH2 authentication system and do not need these additional dependencies. Thirdly, guzzle and league packages are used a lot. Therefore you make it hard for people that were already using these packages to newer versions of PHPMailer.
126ffa9
@frederikbosch frederikbosch Remove guzzle, suggest oauth2 df582f0
@Synchro Synchro Merge pull request #481 from frederikbosch/patch-1
Do no require a dependency that is not required
cbd7fa9
@Synchro Synchro 5.2.12 release 5dd7541
Commits on Sep 04, 2015
@Synchro Synchro Merge branch 'master' of ssh://github.com/PHPMailer/PHPMailer 14ace3d
@glensc glensc Update phpmailer.lang-et.php c890307
@Synchro Synchro Merge pull request #489 from glensc/patch-1
Update phpmailer.lang-et.php
3fb22c5
Commits on Sep 14, 2015
@Synchro Synchro Rename oauth class de8e32f
@Synchro Synchro Merge branch 'master' of ssh://github.com/PHPMailer/PHPMailer 2ca7f72
@Synchro Synchro 5.2.13 release 45df3a8
Commits on Sep 15, 2015
@fbonzon fbonzon Update French translation dbf3fad
@fbonzon fbonzon Remove trailing space, add line breaks for readability b41b259
@fbonzon fbonzon Remove trailing slash in URL
Trailing slash in GitHub URLs is not needed, and for consistency with
PHPMailer logo which does not have the trailing slash
09c9eba
@Synchro Synchro Merge pull request #497 from fbonzon/patch1
Update French translation, minor changes
20b7053
Commits on Sep 17, 2015
@Synchro Synchro Remove exec bit acaeaa9
@fbonzon fbonzon Remove exec bit
Introduced by mistake in dbf3fad
6288e18
@Synchro Synchro Merge pull request #501 from fbonzon/master
Remove exec bit
76619dd
@fbonzon fbonzon Prefer setFrom() over separate From and FromName 20112cc
@fbonzon fbonzon Make sure PHP default character encoding is UTF-8
Needed for htmlentities() call on line 173
e1964dd
@Synchro Synchro Merge pull request #502 from fbonzon/master
In examples, prefer setFrom() over separate From and FromName
b192b45
Commits on Sep 19, 2015
@fbonzon fbonzon Fix comments about $Hostname
According to changelog, setting the Received header has been removed in Version 1.72 in 2004.

The $Hostname value has actually no influence on the HELO string.
8a07954
@fbonzon fbonzon Improve again comment about $Hostname and HELO string relation 4cd1309
@Synchro Synchro Merge pull request #503 from fbonzon/patch-1
Fix comments about $Hostname
d9b8d4a
Commits on Sep 21, 2015
@Nibbels Nibbels Update signed-mail.phps b580214
@Nibbels Nibbels Update signed-mail.phps 5353214
@Nibbels Nibbels Update signed-mail.phps 6672f36
Commits on Sep 22, 2015
@Synchro Synchro Merge pull request #504 from Nibbels/master
Certificate Chain fix for Thunderbird
b3677b9
@Synchro Synchro Avoid IDE warnings in a mixed PHP version project d6d7a8d
@Synchro Synchro Clean up b6f421c
Commits on Sep 24, 2015
@Synchro Synchro Allow retrieving POP3 errors
Move private properties to protected
40a0a1b
Commits on Sep 28, 2015
@dnepro dnepro [TASK]
replace "@type" annotation in favor of "@var" as proposed by phpdoc.org

Issue #513
8703507
@Synchro Synchro Merge pull request #515 from dnepro/master
[TASK] replace "@type" annotation in favor of "@var" as proposed by phpdoc.org
e2a9ec1
Commits on Oct 02, 2015
@fbonzon fbonzon Change line endings from CRLF to LF
All files in PHPMailer have LF line endings, except those two.
Harmonize line endings to LF for consistency.
b874629
@Synchro Synchro Merge pull request #520 from fbonzon/master
Change line endings from CRLF to LF
8bea0ad
Commits on Oct 13, 2015
@fbonzon fbonzon Improve some comments and minor improvements
- Define an $error_message and reuse it, instead of recreating the
error message 3 times
- Use in_array() check instead of a regex
4532cec
@Synchro Synchro Merge pull request #526 from fbonzon/comments
Improve some comments and minor improvements
23c3589
@fbonzon fbonzon Prefer array_key_exists() over isset() c2447dc
@Synchro Synchro Merge pull request #527 from fbonzon/array_key_exists
Prefer array_key_exists() over isset()
6b12c21
Commits on Oct 14, 2015
@fbonzon fbonzon Allow addresses with IDN
Accepts Internationalized Domain Name everywhere PHPMailler expects
email addresses (To, CC, BCC, Reply-To, From, Sender and
ConfirmReadingTo).

Requires PHP >= 5.3 with "intl" extension installed and "mbstring"
extension enabled. Earlier versions don't see a change, i.e. specifying
an address with IDN still fails validation.

Follow-up to PR #516. Ran test/phpmailerTest.php

Other changes:

- From, Sender and ConfirmReadingTo addresses are now validated in
send(). Previously, only From and Sender addresses would be validated
only if specified via the setFrom() method. ConfirmReadingTo was never
validated.

- Half language strings for the 'invalid_address' message used colon at
the end and half didn't. Harmonized messages to always include colon,
and not add a second one with PHP code.
0fa9518
@fbonzon fbonzon Fix comments, suggested by scrutinizer 65c213a
@Synchro Synchro Merge pull request #530 from fbonzon/scrutinizer
Fix comments, suggested by scrutinizer
aeae681
@Synchro Synchro Merge pull request #529 from fbonzon/master
Allow addresses with IDN
efd91ea
@Synchro Synchro Correct documented type of OAuth property. Will probably need to chan…
…ge this when merging xoauth banch.
8e02d00
@Synchro Synchro Changelog 881289b