aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Clay <steve@mrclay.org>2014-01-06 23:39:29 -0500
committerSteve Clay <steve@mrclay.org>2014-01-06 23:39:29 -0500
commit2634e94664045e08b3960dc83487d6357ec081a7 (patch)
treebc93917051e4bb087f4f8cf1116b61b1d41f7221
parent53509917fd2119e17209179aae6d54b64dd2d244 (diff)
downloadelgg-2634e94664045e08b3960dc83487d6357ec081a7.tar.gz
elgg-2634e94664045e08b3960dc83487d6357ec081a7.tar.bz2
Fixes #6309: Fixes notify_user() broken by 63db31c
-rw-r--r--engine/lib/notification.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/lib/notification.php b/engine/lib/notification.php
index 2506867..be0c359 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;