forked from GNUsocial/gnu-social
		
	some variable names swapped around when I split up the big method
darcs-hash:20080626184811-34904-d5d7373acb89b06eb3f0854d83b0ac425a70d1e2.gz
This commit is contained in:
		@@ -148,6 +148,8 @@ class ImsettingsAction extends SettingsAction {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	function add_address() {
 | 
						function add_address() {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							$user = common_current_user();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		$jabber = $this->trimmed('jabber');
 | 
							$jabber = $this->trimmed('jabber');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		# Some validation
 | 
							# Some validation
 | 
				
			||||||
@@ -191,7 +193,7 @@ class ImsettingsAction extends SettingsAction {
 | 
				
			|||||||
		# XXX: optionally queue for offline sending
 | 
							# XXX: optionally queue for offline sending
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		if (!jabber_is_subscribed($jabber)) {
 | 
							if (!jabber_is_subscribed($jabber)) {
 | 
				
			||||||
			jabber_special_presence('subscribe', $address);
 | 
								jabber_special_presence('subscribe', $jabber);
 | 
				
			||||||
		} else {
 | 
							} else {
 | 
				
			||||||
			jabber_confirm_address($confirm->code,
 | 
								jabber_confirm_address($confirm->code,
 | 
				
			||||||
								   $user->nickname,
 | 
													   $user->nickname,
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user