wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

show the proper address in the message for non-email confirms

Browse Source 
darcs-hash:20080626072159-34904-b025f2d626b3421ca0a658b5664504b4a261b993.gz
This commit is contained in:
Evan Prodromou 2008-06-26 03:21:59 -04:00
parent 6bf590257f
commit 06d267bd88
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
actions/confirmaddress.php
View File

@ -52,9 +52,9 @@ class ConfirmaddressAction extends Action {
$this->client_error(_t('That address has already been confirmed.')); $this->client_error(_t('That address has already been confirmed.'));
return; return;
} }
$cur->query('BEGIN'); $cur->query('BEGIN');
$orig_user = clone($cur); $orig_user = clone($cur);
$cur->$type = $confirm->address; $cur->$type = $confirm->address;
@ -62,28 +62,28 @@ class ConfirmaddressAction extends Action {
if ($type == 'sms') { if ($type == 'sms') {
$cur->carrier = ($confirm->address_extra)+0; $cur->carrier = ($confirm->address_extra)+0;
} }
$result = $cur->updateKeys($orig_user); $result = $cur->updateKeys($orig_user);
if (!$result) { if (!$result) {
common_log_db_error($cur, 'UPDATE', __FILE__); common_log_db_error($cur, 'UPDATE', __FILE__);
$this->server_error(_t('Couldn\'t update user.')); $this->server_error(_t('Couldn\'t update user.'));
return; return;
} }
$result = $confirm->delete(); $result = $confirm->delete();
if (!$result) { if (!$result) {
common_log_db_error($confirm, 'DELETE', __FILE__); common_log_db_error($confirm, 'DELETE', __FILE__);
$this->server_error(_t('Couldn\'t delete email confirmation.')); $this->server_error(_t('Couldn\'t delete email confirmation.'));
return; return;
} }
$cur->query('COMMIT'); $cur->query('COMMIT');
common_show_header(_t('Confirm Address')); common_show_header(_t('Confirm Address'));
common_element('p', NULL, common_element('p', NULL,
_t('The address "') . $cur->email . _t('The address "') . $cur->$type .
_t('" has been confirmed for your account.')); _t('" has been confirmed for your account.'));
common_show_footer(); common_show_footer();
} }