summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-02-22 06:00:13 +0000
committerBrion Vibber <brion@pobox.com>2010-02-22 06:00:13 +0000
commit17ed30dffc1c05259baf2f0387089547e39684d7 (patch)
tree50e097adae6a56527967dcc92f3aac44ee9ab0ca
parent891e0028838e51788e917d947cc280dbd53c1792 (diff)
OStatus: fix remote subscription when putting webfinger address in the little box
-rw-r--r--plugins/OStatus/actions/ostatusinit.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/OStatus/actions/ostatusinit.php b/plugins/OStatus/actions/ostatusinit.php
index 4afde2c36..abd8cb541 100644
--- a/plugins/OStatus/actions/ostatusinit.php
+++ b/plugins/OStatus/actions/ostatusinit.php
@@ -119,7 +119,7 @@ class OStatusInitAction extends Action
} else {
$this->connectProfile($this->acct);
}
- } elseif (strpos('@', $this->acct) !== false) {
+ } elseif (strpos($this->acct, '@') !== false) {
$this->connectWebfinger($this->acct);
}
}
@@ -139,7 +139,7 @@ class OStatusInitAction extends Action
$user = User::staticGet('nickname', $this->nickname);
$target_profile = common_local_url('userbyid', array('id' => $user->id));
- $url = $w->applyTemplate($link['template'], $feed_url);
+ $url = $w->applyTemplate($link['template'], $target_profile);
common_redirect($url, 303);
}