Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

This commit is contained in:
Brion Vibber
2010-02-24 20:38:38 +00:00
2 changed files with 11 additions and 13 deletions

View File

@@ -221,9 +221,17 @@ class OStatusPlugin extends Plugin
$webfinger = $wmatch[0];
$this->log(LOG_INFO, "Checking Webfinger for address '$webfinger'");
$oprofile = Ostatus_profile::ensureWebfinger($webfinger);
if (!empty($oprofile)) {
if (empty($oprofile)) {
$this->log(LOG_INFO, "No Ostatus_profile found for address '$webfinger'");
} else {
$this->log(LOG_INFO, "Ostatus_profile found for address '$webfinger'");
$profile = $oprofile->localProfile();