From: Evan Prodromou <evan@controlezvous.ca>
Date: Thu, 26 Jun 2008 07:21:59 +0000 (-0400)
Subject: show the proper address in the message for non-email confirms
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=06d267bd88bdc7897960afeb2342901e81b5e4b4;p=quix0rs-gnu-social.git

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

darcs-hash:20080626072159-34904-b025f2d626b3421ca0a658b5664504b4a261b993.gz
---

diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index c34a636685..9e0d7b2110 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();
     }