GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

If there's an exception in notice distribution, continue

This commit is contained in:
Evan Prodromou 2012-11-25 10:39:49 -05:00
parent 6aaee4e5fe
commit 6f424eb80f
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
classes/Notice.php
View File

@ -1031,9 +1031,15 @@ class Notice extends Managed_DataObject
} }
foreach ($ni as $id => $source) { foreach ($ni as $id => $source) {
$user = User::staticGet('id', $id); try {
if (empty($user) || $user->hasBlocked($profile) || $user = User::staticGet('id', $id);
($originalProfile && $user->hasBlocked($originalProfile))) { if (empty($user) ||
$user->hasBlocked($profile) ||
($originalProfile && $user->hasBlocked($originalProfile))) {
unset($ni[$id]);
}
} catch (UserNoProfileException $e) {
// User doesn't have a profile; invalid; skip them.
unset($ni[$id]); unset($ni[$id]);
} }
} }