summaryrefslogtreecommitdiff
path: root/actions/confirmemail.php
diff options
context:
space:
mode:
Diffstat (limited to 'actions/confirmemail.php')
-rw-r--r--actions/confirmemail.php12
1 files changed, 9 insertions, 3 deletions
diff --git a/actions/confirmemail.php b/actions/confirmemail.php
index 8052452ae..e69cc6fff 100644
--- a/actions/confirmemail.php
+++ b/actions/confirmemail.php
@@ -47,21 +47,27 @@ class ConfirmemailAction extends Action {
$this->client_error(_t('That email address is already confirmed.'));
return;
}
+
$cur->query('BEGIN');
+
$orig_user = clone($cur);
$cur->email = $confirm_email->email;
- common_debug('cur email = "' . $cur->email . '"', __FILE__);
$result = $cur->update($orig_user);
+
if (!$result) {
- $this->server_error(_t('Error setting email address.'));
+ common_log_db_error($cur, 'UPDATE', __FILE__);
return;
}
+
$result = $confirm_email->delete();
+
if (!$result) {
- $this->server_error(_t('Error deleting code.'));
+ common_log_db_error($confirm_email, 'DELETE', __FILE__);
return;
}
+
$cur->query('COMMIT');
+
common_show_header(_t('Confirm E-mail Address'));
common_element('p', NULL,
_t('The email address "') . $cur->email .