1 files changed, 12 insertions, 5 deletions
diff --git a/actions/subscribe.php b/actions/subscribe.php
index c06057fb8..871b34f31 100644
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -20,7 +20,7 @@
 if (!defined('LACONICA')) { exit(1); }
 
 class SubscribeAction extends Action {
-	
+
 	function handle($args) {
 		parent::handle($args);
 
@@ -39,16 +39,23 @@ class SubscribeAction extends Action {
 		# CSRF protection
 
 		$token = $this->trimmed('token');
-		
+
 		if (!$token || $token != common_session_token()) {
 			$this->client_error(_('There was a problem with your session token. Try again, please.'));
 			return;
 		}
 
-		$other_nickname = $this->arg('subscribeto');
+		$other_id = $this->arg('subscribeto');
+
+        $other = User::staticGet('id', $other_id);
+
+        if (!$other) {
+			$this->client_error(_('Not a local user.'));
+			return;
+        }
+
+		$result = subs_subscribe_to($user, $other);
 
-		$result=subs_subscribe_user($user, $other_nickname);
-		
 		if($result != true) {
 			common_user_error($result);
 			return;