summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlezvous.ca>2008-06-26 14:48:11 -0400
committerEvan Prodromou <evan@controlezvous.ca>2008-06-26 14:48:11 -0400
commit0b0beda026a2b922b8554b94a7ef768cb4331e66 (patch)
treef47917fd35b6204afb4fbb5471e74759992d141c
parent7a973f93a34920d47e0eeff5320a9125b45d08cb (diff)
some variable names swapped around when I split up the big method
darcs-hash:20080626184811-34904-d5d7373acb89b06eb3f0854d83b0ac425a70d1e2.gz
-rw-r--r--actions/imsettings.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/actions/imsettings.php b/actions/imsettings.php
index b76779a70..836c473fc 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -148,6 +148,8 @@ class ImsettingsAction extends SettingsAction {
function add_address() {
+ $user = common_current_user();
+
$jabber = $this->trimmed('jabber');
# Some validation
@@ -191,7 +193,7 @@ class ImsettingsAction extends SettingsAction {
# XXX: optionally queue for offline sending
if (!jabber_is_subscribed($jabber)) {
- jabber_special_presence('subscribe', $address);
+ jabber_special_presence('subscribe', $jabber);
} else {
jabber_confirm_address($confirm->code,
$user->nickname,