Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
P
phpmailer
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
project
phpmailer
Commits
b817bab2
Commit
b817bab2
authored
13 years ago
by
Daniel Kudwien
Browse files
Options
Downloads
Patches
Plain Diff
Issue
#1188610
by sun: Fixed bogus variable $mail in exception handling.
parent
df8b7317
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.txt
+1
-0
1 addition, 0 deletions
CHANGELOG.txt
includes/phpmailer.class.inc
+5
-3
5 additions, 3 deletions
includes/phpmailer.class.inc
with
6 additions
and
3 deletions
CHANGELOG.txt
+
1
−
0
View file @
b817bab2
PHPMailer 7.x-3.x, xxxx-xx-xx
PHPMailer 7.x-3.x, xxxx-xx-xx
-----------------------------
-----------------------------
#1188610 by sun: Fixed bogus variable $mail in exception handling.
#1183836 by sun: Fixed more verbose log messages required in case of an error.
#1183836 by sun: Fixed more verbose log messages required in case of an error.
#1183820 by sun: Allow sending test mail without globally enabling PHPMailer.
#1183820 by sun: Allow sending test mail without globally enabling PHPMailer.
#971172 by sun, Shaun Dychko: Clarify Google Apps support.
#971172 by sun, Shaun Dychko: Clarify Google Apps support.
...
...
This diff is collapsed.
Click to expand it.
includes/phpmailer.class.inc
+
5
−
3
View file @
b817bab2
...
@@ -360,15 +360,17 @@ class DrupalPHPMailer extends PHPMailer implements MailSystemInterface {
...
@@ -360,15 +360,17 @@ class DrupalPHPMailer extends PHPMailer implements MailSystemInterface {
// Message is a safe t() string from DrupalPHPMailer::SetLanguage().
// Message is a safe t() string from DrupalPHPMailer::SetLanguage().
$output
=
$e
->
getMessage
();
$output
=
$e
->
getMessage
();
// Attempt to delimit summary from full message.
$output
.
=
"
\n
"
;
$arguments
=
array
();
$arguments
=
array
();
// Append SMTP communication output.
// Append SMTP communication output.
if
(
$
mail
->
drupalDebugOutput
)
{
if
(
$
this
->
drupalDebugOutput
)
{
// PHPMailer debug output contains HTML linebreaks. PRE is more readable.
// PHPMailer debug output contains HTML linebreaks. PRE is more readable.
$
mail
->
drupalDebugOutput
=
str_replace
(
'<br />'
,
''
,
$
mail
->
drupalDebugOutput
);
$
this
->
drupalDebugOutput
=
str_replace
(
'<br />'
,
''
,
$
this
->
drupalDebugOutput
);
$output
.
=
'<p><strong>Server response:</strong></p>'
;
$output
.
=
'<p><strong>Server response:</strong></p>'
;
$output
.
=
"<pre>
\n
@smtp_output
\n
</pre>"
;
$output
.
=
"<pre>
\n
@smtp_output
\n
</pre>"
;
$arguments
+=
array
(
$arguments
+=
array
(
'@smtp_output'
=>
$
mail
->
drupalDebugOutput
,
'@smtp_output'
=>
$
this
->
drupalDebugOutput
,
);
);
}
}
// We need to log the message in order to be able to debug why the server
// We need to log the message in order to be able to debug why the server
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment