diff options
| author | Juho Jaakkola <juho.jaakkola@mediamaisteri.com> | 2014-01-07 02:03:00 -0800 |
|---|---|---|
| committer | Juho Jaakkola <juho.jaakkola@mediamaisteri.com> | 2014-01-07 02:03:00 -0800 |
| commit | 309fa6efad777ac313372a08ffec16271fa77c1c (patch) | |
| tree | bc93917051e4bb087f4f8cf1116b61b1d41f7221 /engine/lib | |
| parent | 53509917fd2119e17209179aae6d54b64dd2d244 (diff) | |
| parent | 2634e94664045e08b3960dc83487d6357ec081a7 (diff) | |
| download | elgg-309fa6efad777ac313372a08ffec16271fa77c1c.tar.gz elgg-309fa6efad777ac313372a08ffec16271fa77c1c.tar.bz2 | |
Merge pull request #6311 from mrclay/6309_fix
Fixes #6309: Fixes notify_user() broken by 63db31c
Diffstat (limited to 'engine/lib')
| -rw-r--r-- | engine/lib/notification.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/lib/notification.php b/engine/lib/notification.php index 2506867d5..be0c359d4 100644 --- a/engine/lib/notification.php +++ b/engine/lib/notification.php @@ -113,7 +113,7 @@ function notify_user($to, $from, $subject, $message, array $params = NULL, $meth $tmp = get_user_notification_settings($guid); $methods = array(); // $tmp may be false. don't cast - if (is_array($tmp)) { + if (is_object($tmp)) { foreach ($tmp as $k => $v) { // Add method if method is turned on for user! if ($v) { @@ -168,7 +168,7 @@ function notify_user($to, $from, $subject, $message, array $params = NULL, $meth * * @param int $user_guid The user id * - * @return stdClass + * @return stdClass|false */ function get_user_notification_settings($user_guid = 0) { $user_guid = (int)$user_guid; |