Merge request #59 which was directed at master

diff --git a/lib/apiaction.php b/lib/apiaction.php
index 1bd80ad1225e74158482b816f5bd0277d455cdc8..155d91ca7b3953072e6c7f80bffc0b0333340be2 100644 (file)
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -274,11 +274,11 @@ class ApiAction extends Action
                 $sub = Subscription::getSubscription($this->scoped, $profile);
                 // Notifications on?
                 $twitter_user['following'] = true;
-                $twitter_user['statusnet_blocking']  = $this->scoped->hasBlocked($profile);
                 $twitter_user['notifications'] = ($sub->jabber || $sub->sms);
             } catch (NoResultException $e) {
                 // well, the values are already false...
             }
+            $twitter_user['statusnet_blocking']  = $this->scoped->hasBlocked($profile);            
         }
 
         if ($get_notice) {