some variable names swapped around when I split up the big method

darcs-hash:20080626184811-34904-d5d7373acb89b06eb3f0854d83b0ac425a70d1e2.gz

diff --git a/actions/imsettings.php b/actions/imsettings.php
index b76779a7093ab6256b292d4dec2cc39ab0687b65..836c473fcb58f842d44d3d3025f4719662e4502c 100644 (file)
--- 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,