We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 7258969c authored by Evan Prodromou's avatar Evan Prodromou

use query method to do some transactions

darcs-hash:20080619033619-84dde-e4fcc00f5d86cb0d11feff5f88f719ea72d3318e.gz
parent 4aedce68
......@@ -55,9 +55,23 @@ class FinishaddopenidAction extends Action {
if ($sreg_resp) {
$sreg = $sreg_resp->contents();
}
$cur =& common_current_user();
common_debug('cur = ' .print_r($cur, TRUE), __FILE__);
$other = $this->get_user($canonical);
if ($other) {
if ($other->id == $cur->id) {
$this->message(_t('You already have this OpenID!'));
} else {
$this->message(_t('Someone else already has this OpenID.'));
}
return;
}
# start a transaction
$cur->query('BEGIN');
$result = oid_link_user($cur->id, $display, $canonical);
if (!$result) {
......@@ -70,7 +84,11 @@ class FinishaddopenidAction extends Action {
return;
}
}
# success!
$cur->query('COMMIT');
common_redirect(common_local_url('openidsettings'));
}
}
......
......@@ -112,16 +112,13 @@ class ProfilesettingsAction extends SettingsAction {
$user = common_current_user();
assert(!is_null($user)); # should already be checked
# FIXME: transaction!
$user->query('BEGIN');
$original = clone($user);
$user->nickname = $nickname;
$user->email = $email;
common_debug('Updating, nickname ="'.$user->nickname.'" and email ="'.$user->email.'"');
common_debug('Original, nickname ="'.$original->nickname.'" and email ="'.$original->email.'"');
$result = $user->update($original);
if (!$result) {
......
......@@ -57,10 +57,6 @@ function oid_link_user($id, $canonical, $display) {
return false;
}
# For some reason, autocommit is turned off
$oid->query('COMMIT');
return true;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment