aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/notifications/method
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2012-09-08 16:12:20 -0500
committerNathan Guse <nathaniel.guse@gmail.com>2012-09-08 16:12:20 -0500
commit86b801df7304d43f117bea762710149c25385260 (patch)
treeb2b7be759986c33ea420b49deae901a712faff7d /phpBB/includes/notifications/method
parent1e53f7df9d430422e7bb827f3449ef744fc1ed6f (diff)
downloadforums-86b801df7304d43f117bea762710149c25385260.tar
forums-86b801df7304d43f117bea762710149c25385260.tar.gz
forums-86b801df7304d43f117bea762710149c25385260.tar.bz2
forums-86b801df7304d43f117bea762710149c25385260.tar.xz
forums-86b801df7304d43f117bea762710149c25385260.zip
[ticket/11103] Some fixes for the email method
PHPBB3-11103
Diffstat (limited to 'phpBB/includes/notifications/method')
-rw-r--r--phpBB/includes/notifications/method/email.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notifications/method/email.php
index 725ede7913..0120485cff 100644
--- a/phpBB/includes/notifications/method/email.php
+++ b/phpBB/includes/notifications/method/email.php
@@ -29,7 +29,7 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base
return true;
}
- public function notify()
+ public function notify($notification)
{
// email the user
}
@@ -70,7 +70,7 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base
{
$notification->users($users);
- $user = $notification->get_user();
+ $user = $notification->get_user($notification->user_id);
$messenger->template('privmsg_notify', $user['user_lang']);
@@ -82,10 +82,10 @@ class phpbb_notifications_method_email extends phpbb_notifications_method_base
'USERNAME' => htmlspecialchars_decode($user['username']),
'U_INBOX' => $board_url . "/ucp.{$this->php_ext}?i=pm&folder=inbox",
- 'U_VIEW_MESSAGE' => $board_url . "/ucp.{$this->php_ext}?i=pm&mode=view&p={$notification->get_item_id()}",
+ 'U_VIEW_MESSAGE' => $board_url . "/ucp.{$this->php_ext}?i=pm&mode=view&p={$notification->item_id}",
));
- $messenger->send($addr['method']);
+ $messenger->send('email');
}
// Save the queue in the messenger class (has to be called or these emails could be lost?)