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

Fix for failure/exception on subscription/subscriber lists when deleted profiles are stuck in cached list. 

Workaround for deleted profiles still appearing in cached subscriptions/subscribers lists: if we couldn't fetch them, don't include them in the ArrayWrapper.
ArrayWrapper doesn't deal well with null entries, which aren't meant to happen in how it works. This code has recently changed from dying directly with a PHP fatal error in that case to throwing an exception, which allows tracking down the caller.

It looks like there might be some cases where profiles and their matching subscriptions get deleted, but the subscription entries don't get properly cleared from cache... that still bears further investigation. The regular code path looks ok; calls Subscription::cancel() from code called in Profile::delete(); but if they're batch-deleted instead of one row at a time, that could fail to trigger.
This commit is contained in:
Brion Vibber 2011-02-11 13:21:53 -08:00
parent ffe2da4c80
commit 454a980bd4
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
classes/Profile.php
View File

@ -354,7 +354,10 @@ class Profile extends Memcached_DataObject
$profiles = array();
while ($subs->fetch()) {
$profiles[] = Profile::staticGet($subs->subscribed);
$profile = Profile::staticGet($subs->subscribed);
if ($profile) {
$profiles[] = $profile;
}
}
return new ArrayWrapper($profiles);
@ -369,7 +372,10 @@ class Profile extends Memcached_DataObject
$profiles = array();
while ($subs->fetch()) {
$profiles[] = Profile::staticGet($subs->subscriber);
$profile = Profile::staticGet($subs->subscriber);
if ($profile) {
$profiles[] = $profile;
}
}
return new ArrayWrapper($profiles);