diff options
author | Mike Cochrane <mikec@mikenz.geek.nz> | 2008-07-08 05:51:13 -0400 |
---|---|---|
committer | Mike Cochrane <mikec@mikenz.geek.nz> | 2008-07-08 05:51:13 -0400 |
commit | 0f502b8d8656bf9f1340611893dd0e4d736aeea3 (patch) | |
tree | 2c0dcf307cba098eb00aeb5b5582bec07b6aa5bc /actions/finishaddopenid.php | |
parent | 87b494f1ebbe7640d194ef322af12fdf378295df (diff) |
Remove tralling whitespace on lines and a gettext replacement that I missed.
darcs-hash:20080708095113-533db-ad63bbde67b6275fb7ae944cc9882adf6f3be517.gz
Diffstat (limited to 'actions/finishaddopenid.php')
-rw-r--r-- | actions/finishaddopenid.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/actions/finishaddopenid.php b/actions/finishaddopenid.php index 49e54a34f..028dc82e5 100644 --- a/actions/finishaddopenid.php +++ b/actions/finishaddopenid.php @@ -45,7 +45,7 @@ class FinishaddopenidAction extends Action { // Authentication failed; display the error message. $this->message(sprintf(_('OpenID authentication failed: %s'), $response->message)); } else if ($response->status == Auth_OpenID_SUCCESS) { - + $display = $response->getDisplayIdentifier(); $canonical = ($response->endpoint && $response->endpoint->canonicalID) ? $response->endpoint->canonicalID : $display; @@ -58,7 +58,7 @@ class FinishaddopenidAction extends Action { $cur =& common_current_user(); $other = oid_get_user($canonical); - + if ($other) { if ($other->id == $cur->id) { $this->message(_('You already have this OpenID!')); @@ -69,11 +69,11 @@ class FinishaddopenidAction extends Action { } # start a transaction - + $cur->query('BEGIN'); - + $result = oid_link_user($cur->id, $canonical, $display); - + if (!$result) { $this->message(_('Error connecting user.')); return; @@ -84,13 +84,13 @@ class FinishaddopenidAction extends Action { return; } } - + # success! - + $cur->query('COMMIT'); oid_set_last($display); - + common_redirect(common_local_url('openidsettings')); } } |