diff options
| author | Sem <sembrestels@riseup.net> | 2012-12-07 23:55:12 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-12-07 23:55:12 +0100 |
| commit | 3ed289b03fa3d851fd7fffbc0441ebc9b5e98310 (patch) | |
| tree | b2c8d2d7f569f0e3e7bfa6711cef96f806aea9f1 /engine/lib/notification.php | |
| parent | 2b2af5392f0daadc22a1db04aa17c17d4dd37c65 (diff) | |
| parent | ccf7abb4b2b94781f9b67a6cf8798994aa1cca0d (diff) | |
| download | elgg-3ed289b03fa3d851fd7fffbc0441ebc9b5e98310.tar.gz elgg-3ed289b03fa3d851fd7fffbc0441ebc9b5e98310.tar.bz2 | |
Merge tag '1.8.11' of git://github.com/Elgg/Elgg
Elgg 1.8.11 release
Diffstat (limited to 'engine/lib/notification.php')
| -rw-r--r-- | engine/lib/notification.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engine/lib/notification.php b/engine/lib/notification.php index 18faff27f..9e3c075a8 100644 --- a/engine/lib/notification.php +++ b/engine/lib/notification.php @@ -38,7 +38,7 @@ $NOTIFICATION_HANDLERS = array(); function register_notification_handler($method, $handler, $params = NULL) { global $NOTIFICATION_HANDLERS; - if (is_callable($handler)) { + if (is_callable($handler, true)) { $NOTIFICATION_HANDLERS[$method] = new stdClass; $NOTIFICATION_HANDLERS[$method]->handler = $handler; @@ -131,8 +131,9 @@ function notify_user($to, $from, $subject, $message, array $params = NULL, $meth // Extract method details from list $details = $NOTIFICATION_HANDLERS[$method]; $handler = $details->handler; + /* @var callable $handler */ - if ((!$NOTIFICATION_HANDLERS[$method]) || (!$handler)) { + if ((!$NOTIFICATION_HANDLERS[$method]) || (!$handler) || (!is_callable($handler))) { error_log(elgg_echo('NotificationException:NoHandlerFound', array($method))); } @@ -140,7 +141,7 @@ function notify_user($to, $from, $subject, $message, array $params = NULL, $meth // Trigger handler and retrieve result. try { - $result[$guid][$method] = $handler( + $result[$guid][$method] = call_user_func($handler, $from ? get_entity($from) : NULL, // From entity get_entity($guid), // To entity $subject, // The subject |