summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorEvan Prodromou <evan@prodromou.name>2008-07-05 23:57:07 -0400
committerEvan Prodromou <evan@prodromou.name>2008-07-05 23:57:07 -0400
commite4a1b9cde9e975209c76e5e7322a14336b42f18f (patch)
treee9ffb52295411abc5d1711cfdcee06c579a9c05e /actions
parent13ac93481c7080434329e83caf52db9c95692e17 (diff)
optionally queue jabber confirmations
darcs-hash:20080706035707-84dde-5403fe9bcb017c401fe5847527628df548e54499.gz
Diffstat (limited to 'actions')
-rw-r--r--actions/imsettings.php16
1 files changed, 7 insertions, 9 deletions
diff --git a/actions/imsettings.php b/actions/imsettings.php
index 4ad63e1cc..bad0bc18a 100644
--- 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);
}