X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fsmssettings.php;h=844fb6160b3e94b560d6f8f3841a20bd41d390da;hb=ee858bc8809f846860e4372444b172d8737abc75;hp=34243c72b6f154dfd8ed2d655a441905a7f8198e;hpb=d515fae0a87abfb08f9522c2d7938f3d51363556;p=quix0rs-gnu-social.git

diff --git a/actions/smssettings.php b/actions/smssettings.php
index 34243c72b6..844fb6160b 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -56,8 +56,8 @@ class SmssettingsAction extends EmailsettingsAction {
 				common_element('span', 'address unconfirmed', $confirm->address . ' (' . $carrier->name . ')');
 				common_element('span', 'input_instructions',
 							   _('Awaiting confirmation on this phone number.'));
-				common_hidden('sms', $user->sms);
-				common_hidden('carrier', $user->carrier);
+				common_hidden('sms', $confirm->address);
+				common_hidden('carrier', $confirm->address_extra);
 				common_element_end('p');
 				common_submit('cancel', _('Cancel'));
 				common_input('code', _('Confirmation code'), NULL,
@@ -229,8 +229,8 @@ class SmssettingsAction extends EmailsettingsAction {
 			$this->show_form(_('No pending confirmation to cancel.'));
 			return;
 		}
-		if ($confirm->address != $sms || $confirm->address_extra != $carrier) {
-			$this->show_form(_('That is the wrong IM address.'));
+		if ($confirm->address != $sms) {
+			$this->show_form(_('That is the wrong confirmation number.'));
 			return;
 		}