diff options
author | Evan Prodromou <evan@status.net> | 2010-02-22 07:09:08 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-02-22 07:09:08 -0500 |
commit | 074e3fa895f554a912c7d6657c51d137cfcbe9f9 (patch) | |
tree | be27d714b5674b80899baf4313b1265b7c84084a /plugins/OStatus/actions | |
parent | e94800ced9884f20df73cd6325d0fefb33ac2236 (diff) | |
parent | 35be39e30eacda1b0425a2ae9f8e58cd0867d157 (diff) |
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'plugins/OStatus/actions')
-rw-r--r-- | plugins/OStatus/actions/ostatusinit.php | 4 |
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); } |