Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

[quix0rs-gnu-social.git] / actions / unsubscribe.php

diff --git a/actions/unsubscribe.php b/actions/unsubscribe.php
index 4a5863489ec7249d54f3011b82a75dab17d63c8b..6bb10d448b3e663ceb85b214f8a0db774e39b421 100644 (file)
--- a/actions/unsubscribe.php
+++ b/actions/unsubscribe.php
@@ -81,13 +81,13 @@ class UnsubscribeAction extends Action
         $other = Profile::staticGet('id', $other_id);
 
         if (!$other) {
-            $this->clientError(_('No profile with that id.'));
+            $this->clientError(_('No profile with that ID.'));
             return;
         }
 
         $result = subs_unsubscribe_to($user, $other);
 
-        if ($result != true) {
+        if (is_string($result)) {
             $this->clientError($result);
             return;
         }