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
fb9eaa6c
authored
2020-06-24 14:42:35 -0400
by
Jeff Balicki
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
changed email_address_preference
1 parent
061641c1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
17 deletions
com/Notifications/Notifications.php
com/Notifications/Notifications.php
View file @
fb9eaa6
...
...
@@ -87,18 +87,11 @@ function print_user_notices($showOnlyUnread = false)
$system
=
get_post_meta
(
$notice
[
'notification_id'
],
'system'
,
true
);
$content
=
''
;
if
(
!
isset
(
$notice
[
'message'
])
&&
in_array
(
$triggered
,
$enableTriggers
))
{
$emailAddressPreference
=
get_user_meta
(
$user
->
ID
,
'email_address_preference'
,
true
);
if
(
empty
(
$emailAddressPreference
))
{
$userData
=
get_userdata
(
$user
->
ID
);
$toEmail
=
$userData
->
user_email
;
}
else
{
$pp
=
strtolower
(
$emailAddressPreference
)
.
'_'
;
$toEmail
=
get_user_meta
(
$user
->
ID
,
$pp
.
'email'
,
true
);
$pp
=
strtolower
(
get_user_meta
(
$user
->
ID
,
'profile_preference'
,
true
))
.
"_"
;
$toEmail
=
get_user_meta
(
$user
->
ID
,
$pp
.
"email"
,
true
);
if
(
empty
(
$toEmail
))
{
$userData
=
get_userdata
(
$user
->
ID
);
$toEmail
=
$userData
->
user_email
;
}
$toEmail
=
$user
->
user_email
;
}
$message
=
''
;
...
...
@@ -420,17 +413,13 @@ function send_triggered_notification($uid = 0, $trigger = 'NO_TRIGGER', $args =
}
elseif
(
$uid
==
0
&&
isset
(
$args
[
'email'
]))
{
$toEmail
=
$args
[
'email'
];
}
else
{
$emailAddressPreference
=
get_user_meta
(
$user
->
ID
,
'email_address_preference'
,
true
);
if
(
empty
(
$emailAddressPreference
))
{
$toEmail
=
$user
->
user_email
;
}
else
{
$pp
=
strtolower
(
$emailAddressPreference
)
.
'_'
;
$toEmail
=
get_user_meta
(
$user
->
ID
,
$pp
.
'email'
,
true
);
$pp
=
strtolower
(
get_user_meta
(
$user
->
ID
,
'profile_preference'
,
true
))
.
"_"
;
$toEmail
=
get_user_meta
(
$user
->
ID
,
$pp
.
"email"
,
true
);
if
(
empty
(
$toEmail
))
{
$toEmail
=
$user
->
user_email
;
}
}
}
$contents
=
$email
;
...
...
Please
register
or
sign in
to post a comment