From 0b0beda026a2b922b8554b94a7ef768cb4331e66 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlezvous.ca>
Date: Thu, 26 Jun 2008 14:48:11 -0400
Subject: some variable names swapped around when I split up the big method

darcs-hash:20080626184811-34904-d5d7373acb89b06eb3f0854d83b0ac425a70d1e2.gz
---
 actions/imsettings.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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,
-- 
cgit v1.2.3-54-g00ecf