references
darcs-hash:20080618131519-84dde-a3af7c41be8d9606f39ce4be3029697f913ab053.gz
This commit is contained in:
parent
65816a6e2f
commit
c3adb121ec
@ -34,7 +34,7 @@ class FinishaddopenidAction extends Action {
|
|||||||
|
|
||||||
function try_login() {
|
function try_login() {
|
||||||
|
|
||||||
$consumer = oid_consumer();
|
$consumer =& oid_consumer();
|
||||||
|
|
||||||
$response = $consumer->complete(common_local_url('finishaddopenid'));
|
$response = $consumer->complete(common_local_url('finishaddopenid'));
|
||||||
|
|
||||||
@ -58,12 +58,12 @@ class FinishaddopenidAction extends Action {
|
|||||||
$sreg = $sreg_resp->contents();
|
$sreg = $sreg_resp->contents();
|
||||||
}
|
}
|
||||||
|
|
||||||
$other = $this->get_user($canonical);
|
$other =& $this->get_user($canonical);
|
||||||
|
|
||||||
if ($other) {
|
if ($other) {
|
||||||
$this->message(_t('This OpenID is already associated with user "') . $user->nickname . _t('"'));
|
$this->message(_t('This OpenID is already associated with user "') . $user->nickname . _t('"'));
|
||||||
} else {
|
} else {
|
||||||
$cur = common_current_user();
|
$cur =& common_current_user();
|
||||||
$result = oid_link_user($cur->id, $display, $canonical);
|
$result = oid_link_user($cur->id, $display, $canonical);
|
||||||
if (!$result) {
|
if (!$result) {
|
||||||
$this->message(_t('Error connecting user'));
|
$this->message(_t('Error connecting user'));
|
||||||
@ -96,9 +96,9 @@ class FinishaddopenidAction extends Action {
|
|||||||
return $user;
|
return $user;
|
||||||
}
|
}
|
||||||
|
|
||||||
function update_user($user, $sreg) {
|
function update_user(&$user, $sreg) {
|
||||||
|
|
||||||
$profile = $user->getProfile();
|
$profile =& $user->getProfile();
|
||||||
|
|
||||||
$orig_profile = clone($profile);
|
$orig_profile = clone($profile);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user