summaryrefslogtreecommitdiff
path: root/actions/newmessage.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-12-15 16:24:52 -0500
committerEvan Prodromou <evan@status.net>2009-12-15 16:24:52 -0500
commit2a1468ec8b2918553b490ddaef6bdede3e2d5b1b (patch)
treec94a68a1239a5a3c35d5564323967fcd4ff14523 /actions/newmessage.php
parente9b733e7f036bc03353ae6dd7b096ea179698a4d (diff)
parentf3d27cc3ae92e2b7412dd998d7de7a2b58dc8e6a (diff)
Merge branch '0.9.x' into testing
Diffstat (limited to 'actions/newmessage.php')
-rw-r--r--actions/newmessage.php8
1 files changed, 1 insertions, 7 deletions
diff --git a/actions/newmessage.php b/actions/newmessage.php
index 0db2e7181..350452091 100644
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -173,7 +173,7 @@ class NewmessageAction extends Action
return;
}
- $this->notify($user, $this->other, $message);
+ $message->notify();
if ($this->boolean('ajax')) {
$this->startHTML('text/xml;charset=utf-8');
@@ -247,12 +247,6 @@ class NewmessageAction extends Action
}
}
- function notify($from, $to, $message)
- {
- mail_notify_message($message, $from, $to);
- // XXX: Jabber, SMS notifications... probably queued
- }
-
// Do nothing (override)
function showNoticeForm()