diff options
author | Evan Prodromou <evan@controlezvous.ca> | 2008-06-26 03:21:59 -0400 |
---|---|---|
committer | Evan Prodromou <evan@controlezvous.ca> | 2008-06-26 03:21:59 -0400 |
commit | 06d267bd88bdc7897960afeb2342901e81b5e4b4 (patch) | |
tree | 9202509db622783901174a85db764c61888d8162 | |
parent | 6bf590257ffaec8c7b8530ed8a2c378edeb8b93f (diff) |
show the proper address in the message for non-email confirms
darcs-hash:20080626072159-34904-b025f2d626b3421ca0a658b5664504b4a261b993.gz
-rw-r--r-- | actions/confirmaddress.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php index c34a63668..9e0d7b211 100644 --- a/actions/confirmaddress.php +++ b/actions/confirmaddress.php @@ -52,9 +52,9 @@ class ConfirmaddressAction extends Action { $this->client_error(_t('That address has already been confirmed.')); return; } - + $cur->query('BEGIN'); - + $orig_user = clone($cur); $cur->$type = $confirm->address; @@ -62,28 +62,28 @@ class ConfirmaddressAction extends Action { if ($type == 'sms') { $cur->carrier = ($confirm->address_extra)+0; } - + $result = $cur->updateKeys($orig_user); - + if (!$result) { common_log_db_error($cur, 'UPDATE', __FILE__); $this->server_error(_t('Couldn\'t update user.')); return; } - + $result = $confirm->delete(); - + if (!$result) { common_log_db_error($confirm, 'DELETE', __FILE__); $this->server_error(_t('Couldn\'t delete email confirmation.')); return; } - + $cur->query('COMMIT'); common_show_header(_t('Confirm Address')); common_element('p', NULL, - _t('The address "') . $cur->email . + _t('The address "') . $cur->$type . _t('" has been confirmed for your account.')); common_show_footer(); } |