fb9eaa6c by Jeff Balicki

changed email_address_preference

1 parent 061641c1
......@@ -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;
......