X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fimsettings.php;h=034f6dc2b284518ef50e6e3bae1416403ef180be;hb=ea40dabb392aec3d7b9da666285969bb296a94e2;hp=70aff35f55c2ccf026d46774b95a0b15d0209db9;hpb=d9aea8cb9a99f3af302fc197314ba4da18e24723;p=quix0rs-gnu-social.git

diff --git a/actions/imsettings.php b/actions/imsettings.php
index 70aff35f55..034f6dc2b2 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -52,10 +52,7 @@ class ImsettingsAction extends SettingsAction {
 				common_element_start('p');
 				common_element('span', 'address unconfirmed', $confirm->address);
 				common_element('span', 'input_instructions',
-			  	              sprintf(_('Awaiting confirmation on this address. Check your ' .
-			  	                'Jabber/GTalk account for a message with further ' .
-			  	                'instructions. (Did you add %s to your buddy list?)',
-                                 jabber_daemon_address())));
+			  	              sprintf(_('Awaiting confirmation on this address. Check your Jabber/GTalk account for a message with further instructions. (Did you add %s to your buddy list?)'), jabber_daemon_address()));
 				common_hidden('jabber', $confirm->address);
 				common_element_end('p');
 				common_submit('cancel', _('Cancel'));
@@ -78,6 +75,9 @@ class ImsettingsAction extends SettingsAction {
 		common_checkbox('jabberreplies',
 		                _('Send me replies through Jabber/GTalk from people I\'m not subscribed to.'),
 		                $user->jabberreplies);
+		common_checkbox('jabbermicroid',
+		                _('Publish a MicroID for my Jabber/GTalk address.'),
+		                $user->jabbermicroid);
 		common_submit('save', _('Save'));
 
 		common_element_end('form');
@@ -116,6 +116,7 @@ class ImsettingsAction extends SettingsAction {
 		$jabbernotify = $this->boolean('jabbernotify');
 		$updatefrompresence = $this->boolean('updatefrompresence');
 		$jabberreplies = $this->boolean('jabberreplies');
+		$jabbermicroid = $this->boolean('jabbermicroid');
 
 		$user = common_current_user();
 
@@ -128,6 +129,7 @@ class ImsettingsAction extends SettingsAction {
 		$user->jabbernotify = $jabbernotify;
 		$user->updatefrompresence = $updatefrompresence;
 		$user->jabberreplies = $jabberreplies;
+		$user->jabbermicroid = $jabbermicroid;
 
 		$result = $user->update($original);