init and end documents

darcs-hash:20080718043456-84dde-ffe825e8021e0f803fbbecacdc93d26309853daa.gz

1 files changed, 9 insertions, 4 deletions

diff --git a/actions/twitapifriendships.php b/actions/twitapifriendships.php
index a8de77107..1ea8199e9 100644
--- a/actions/twitapifriendships.php
+++ b/actions/twitapifriendships.php
@@ -32,6 +32,7 @@ class TwitapifriendshipsAction extends TwitterapiAction {
 
 		if (!$other) {
 			$this->client_error(_('No such user'));
+			exit();
 			return;
 		}
 		
@@ -39,6 +40,7 @@ class TwitapifriendshipsAction extends TwitterapiAction {
 		
 		if ($user->isSubscribed($other)) {
 			$this->client_error(_('Already subscribed.'));
+			exit();
 			return;
 		}
 		
@@ -50,14 +52,16 @@ class TwitapifriendshipsAction extends TwitterapiAction {
 
 		if (!$result) {
 			$this->server_error(_('Could not subscribe'));
+			exit();
 			return;
 		}
 		
 		mail_subscribe_notify($other, $user);
 
-		common_start_xml();
+		$type = $apidata['content-type'];
+		$this->init_document($type);
 		$this->show_profile($other);
-		common_end_xml();
+		$this->end_document($type);
 		exit();
 	}
 	
@@ -90,9 +94,10 @@ class TwitapifriendshipsAction extends TwitterapiAction {
 			$sub->delete();
 		}
 
-		common_start_xml();
+		$type = $apidata['content-type'];
+		$this->init_document($type);
 		$this->show_profile($other);
-		common_end_xml();
+		$this->end_document($type);
 		exit();
 	}