Merge branch 'master' of https://git.gnu.io/gnu/gnu-social into social-master

[quix0rs-gnu-social.git] / actions / imsettings.php

diff --git a/actions/imsettings.php b/actions/imsettings.php
index e809981a3f88d5114782bc610d428d831228a273..92fff45a7db6d27f506be1f50520afb717b685af 100644 (file)
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -67,7 +67,7 @@ class ImsettingsAction extends SettingsAction
         // TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
         // TRANS: the order and formatting of link text and link should remain unchanged.
         return _('You can send and receive notices through '.
-                 'instant messaging [instant messages](%%doc.im%%). '.
+                 '[instant messaging](%%doc.im%%). '.
                  'Configure your addresses and settings below.');
     }
 
@@ -292,7 +292,6 @@ class ImsettingsAction extends SettingsAction
                     common_log_db_error($user, 'UPDATE', __FILE__);
                     // TRANS: Server error thrown on database error updating IM preferences.
                     $this->serverError(_('Could not update IM preferences.'));
-                    return;
                 }
             }while($user_im_prefs->fetch());
         }
@@ -364,7 +363,6 @@ class ImsettingsAction extends SettingsAction
             common_log_db_error($confirm, 'INSERT', __FILE__);
             // TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
             $this->serverError(_('Could not insert confirmation code.'));
-            return;
         }
 
         Event::handle('SendImConfirmationCode', array($transport, $screenname, $confirm->code, $user));
@@ -407,7 +405,6 @@ class ImsettingsAction extends SettingsAction
             common_log_db_error($confirm, 'DELETE', __FILE__);
             // TRANS: Server error thrown on database error canceling IM address confirmation.
             $this->serverError(_('Could not delete confirmation.'));
-            return;
         }
 
         // TRANS: Message given after successfully canceling IM address confirmation.
@@ -445,7 +442,6 @@ class ImsettingsAction extends SettingsAction
             common_log_db_error($user, 'UPDATE', __FILE__);
             // TRANS: Server error thrown on database error removing a registered IM address.
             $this->serverError(_('Could not update user IM preferences.'));
-            return;
         }
 
         // XXX: unsubscribe to the old address