mirror of
https://github.com/joomla/joomla-cms.git
synced 2024-08-26 04:59:48 +00:00
^ [#31219] Update to PHPMailer 5.2.6. Thanks Michael Babker.
(Fix #1341)
This commit is contained in:
parent
f6519e4973
commit
762d8a0a23
@ -2,14 +2,14 @@
|
||||
<extension type="library" version="3.1">
|
||||
<name>PHPMailer</name>
|
||||
<libraryname>phpmailer</libraryname>
|
||||
<version>5.2.3</version>
|
||||
<version>5.2.6</version>
|
||||
<description>LIB_PHPMAILER_XML_DESCRIPTION</description>
|
||||
<creationDate>2001</creationDate>
|
||||
<copyright>(c) 2001-2003, Brent R. Matzelle, (c) 2004-2009, Andy Prevost. All Rights Reserved., (c) 2010-2013, Jim Jagielski. All Rights Reserved.</copyright>
|
||||
<license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>
|
||||
<license>http://www.gnu.org/licenses/lgpl-2.1.html GNU/LGPL</license>
|
||||
<author>PHPMailer</author>
|
||||
<authorEmail>jimjag@gmail.com</authorEmail>
|
||||
<authorUrl>https://code.google.com/a/apache-extras.org/p/phpmailer/</authorUrl>
|
||||
<authorUrl>https://github.com/PHPMailer/PHPMailer</authorUrl>
|
||||
<packager>Joomla!</packager>
|
||||
<packagerurl>http://www.joomla.org</packagerurl>
|
||||
<files folder="libraries">
|
||||
|
@ -27,6 +27,7 @@ $ -> Language fix or change
|
||||
|
||||
078-Jul-2013 Jean-Marie Simonet
|
||||
$ Updating installation lang files: et-EE, fa-IR, nl-NL, vi-VN
|
||||
^ [#31219] Update to PHPMailer 5.2.6. Thanks Michael Babker.
|
||||
|
||||
07-Jul-2013 Michael Babker
|
||||
# [#31371] Commit for issue 31351 causes PHP notice in Banner Tracks
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -2,10 +2,11 @@
|
||||
/*~ class.pop3.php
|
||||
.---------------------------------------------------------------------------.
|
||||
| Software: PHPMailer - PHP email class |
|
||||
| Version: 5.2.2 |
|
||||
| Site: https://code.google.com/a/apache-extras.org/p/phpmailer/ |
|
||||
| Version: 5.2.6 |
|
||||
| Site: https://github.com/PHPMailer/PHPMailer/ |
|
||||
| ------------------------------------------------------------------------- |
|
||||
| Admin: Jim Jagielski (project admininistrator) |
|
||||
| Admins: Marcus Bointon |
|
||||
| Admins: Jim Jagielski |
|
||||
| Authors: Andy Prevost (codeworxtech) codeworxtech@users.sourceforge.net |
|
||||
| : Marcus Bointon (coolbru) coolbru@users.sourceforge.net |
|
||||
| : Jim Jagielski (jimjag) jimjag@gmail.com |
|
||||
@ -37,7 +38,7 @@
|
||||
/**
|
||||
* PHP POP-Before-SMTP Authentication Class
|
||||
*
|
||||
* Version 5.2.2
|
||||
* Version 5.2.6
|
||||
*
|
||||
* @license: LGPL, see PHPMailer License
|
||||
*
|
||||
@ -115,7 +116,7 @@ class POP3 {
|
||||
* Sets the POP3 PHPMailer Version number
|
||||
* @var string
|
||||
*/
|
||||
public $Version = '5.2.2';
|
||||
public $Version = '5.2.6';
|
||||
|
||||
/////////////////////////////////////////////////
|
||||
// PROPERTIES, PRIVATE AND PROTECTED
|
||||
@ -216,7 +217,7 @@ class POP3 {
|
||||
|
||||
/*
|
||||
On Windows this will raise a PHP Warning error if the hostname doesn't exist.
|
||||
Rather than supress it with @fsockopen, let's capture it cleanly instead
|
||||
Rather than suppress it with @fsockopen, let's capture it cleanly instead
|
||||
*/
|
||||
|
||||
set_error_handler(array(&$this, 'catchWarning'));
|
||||
@ -269,8 +270,8 @@ class POP3 {
|
||||
|
||||
// Check for the +OK
|
||||
if ($this->checkResponse($pop3_response)) {
|
||||
// The connection is established and the POP3 server is talking
|
||||
$this->connected = true;
|
||||
// The connection is established and the POP3 server is talking
|
||||
$this->connected = true;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
@ -415,4 +416,3 @@ class POP3 {
|
||||
|
||||
// End of class
|
||||
}
|
||||
?>
|
||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user