GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

use query method to do some transactions 

darcs-hash:20080619033619-84dde-e4fcc00f5d86cb0d11feff5f88f719ea72d3318e.gz
This commit is contained in:
Evan Prodromou 2008-06-18 23:36:19 -04:00
parent 4aedce6864
commit 7258969cd4
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
actions/finishaddopenid.php
View File

@ -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'));
}
}

7
actions/profilesettings.php
View File

@ -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) {

4
lib/openid.php
View File

@ -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;
}