reply_to is now stored on the notice, not on the reply record

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

diff --git a/actions/imsettings.php b/actions/imsettings.php
index 4ad63e1ccf1b8ea89a5239d9558f9861e9a17465..bad0bc18a49ccdddf69897eb8a98d16b5d9195fc 100644 (file)
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -185,12 +185,12 @@ class ImsettingsAction extends SettingsAction {
                        return;
                }
 
-               # XXX: queue for offline sending
-
-               jabber_confirm_address($confirm->code,
-                                                          $user->nickname,
-                                                          $jabber);
-
+               if (!common_config('queue', 'enabled')) {
+                       jabber_confirm_address($confirm->code,
+                                                                  $user->nickname,
+                                                                  $jabber);
+               }
+                       
                # XXX: I18N
 
                $msg = 'A confirmation code was sent to the IM address you added. ' .
@@ -246,9 +246,7 @@ class ImsettingsAction extends SettingsAction {
                }
                $user->query('COMMIT');
 
-               # Unsubscribe to the old address
-
-               jabber_special_presence('unsubscribe', $jabber);
+               # XXX: unsubscribe to the old address
 
                $this->show_form(_t('The address was removed.'), TRUE);
        }