fix getting subscribers

darcs-hash:20080610145520-84dde-67e0480537053f7aacf18a8fb1f45e472e115493.gz
This commit is contained in:
Evan Prodromou 2008-06-10 10:55:20 -04:00
parent 02cb345154
commit db29c22286

View File

@ -112,6 +112,10 @@ class FoafAction extends Action {
} else { } else {
$other = User::staticGet('id', $sub->subscribed); $other = User::staticGet('id', $sub->subscribed);
} }
if (!$other) {
common_debug('Got a bad subscription: '.print_r($sub,TRUE));
continue;
}
common_element('knows', array('rdf:resource' => $other->uri)); common_element('knows', array('rdf:resource' => $other->uri));
$person[$other->uri] = array(LISTENEE, $other); $person[$other->uri] = array(LISTENEE, $other);
} }
@ -125,9 +129,13 @@ class FoafAction extends Action {
if ($sub->find()) { if ($sub->find()) {
while ($sub->fetch()) { while ($sub->fetch()) {
if ($sub->token) { if ($sub->token) {
$other = Remote_profile::staticGet('id', $sub->subscribed); $other = Remote_profile::staticGet('id', $sub->subscriber);
} else { } else {
$other = User::staticGet('id', $sub->subscribed); $other = User::staticGet('id', $sub->subscriber);
}
if (!$other) {
common_debug('Got a bad subscription: '.print_r($sub,TRUE));
continue;
} }
if (array_key_exists($other->uri, $person)) { if (array_key_exists($other->uri, $person)) {
$person[$other->uri][0] = BOTH; $person[$other->uri][0] = BOTH;