Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Tenzing
/
Tz Tools
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
18f9cc2d
authored
2014-10-29 11:49:20 -0400
by
Marty Penner
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
Correct how emails are inserted into the mail daemon
1 parent
353cdaee
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
com/Notifications/Notifications.php
com/Notifications/Notifications.php
View file @
18f9cc2
...
...
@@ -269,12 +269,14 @@ function send_triggered_notification($uid = 0, $trigger = "NO_TRIGGER", $args =
);
$sentSuccessfully
=
false
;
$sentTime
=
''
;
if
(
CBV\system_can_send_emails
())
{
$response
=
\wpMandrill
::
mail
(
$to_email
,
$subject
,
!
empty
(
$html
)
?
$html
:
$alttext
,
[],
$attachments
);
if
(
isset
(
$response
[
'status'
])
&&
!
in_array
(
$response
[
'status'
],
[
'rejected'
,
'invalid'
]))
{
if
(
isset
(
$response
[
0
][
'status'
])
&&
isset
(
$response
[
0
][
'status'
])
&&
!
in_array
(
$response
[
'status'
],
[
'rejected'
,
'invalid'
])
)
{
$sentSuccessfully
=
true
;
$sentTime
=
current_time
(
'mysql'
,
1
);
}
}
...
...
@@ -291,8 +293,7 @@ function send_triggered_notification($uid = 0, $trigger = "NO_TRIGGER", $args =
'attachment2'
=>
$att2
,
'attachment3'
=>
$att3
,
'sent'
=>
(
int
)
$sentSuccessfully
,
'sent_date'
=>
$sentTime
,
'created'
=>
current_time
(
'mysql'
,
1
)
'sent_date'
=>
''
],
[
'%d'
,
...
...
Please
register
or
sign in
to post a comment