From 94e7cd42b16846a1677952edbea0c7c52b71fe28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BC?= <fmui@apache.org>
Date: Tue, 12 Jul 2011 10:32:24 +0000
Subject: [PATCH] Fixed following filter in activities dashlet

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28938 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../scripts/activities/feed/UserFeedRetrieverWebScript.java    | 2 +-
 .../subscriptions/AbstractSubscriptionServiceWebScript.java    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/source/java/org/alfresco/repo/web/scripts/activities/feed/UserFeedRetrieverWebScript.java b/source/java/org/alfresco/repo/web/scripts/activities/feed/UserFeedRetrieverWebScript.java
index 0effdc6d51..ac80e188d0 100644
--- a/source/java/org/alfresco/repo/web/scripts/activities/feed/UserFeedRetrieverWebScript.java
+++ b/source/java/org/alfresco/repo/web/scripts/activities/feed/UserFeedRetrieverWebScript.java
@@ -117,7 +117,7 @@ public class UserFeedRetrieverWebScript extends DeclarativeWebScript
         Set<String> userFilter = null;
         if ((onlyFollowingStr != null) && (onlyFollowingStr.equalsIgnoreCase("true") || onlyFollowingStr.equalsIgnoreCase("t")))
         {
-            PagingFollowingResults following = subscriptionService.getFollowers(AuthenticationUtil.getRunAsUser(), new PagingRequest(-1, null));
+            PagingFollowingResults following = subscriptionService.getFollowing(AuthenticationUtil.getRunAsUser(), new PagingRequest(-1, null));
             if (following.getPage() != null)
             {
                 userFilter = new HashSet<String>();
diff --git a/source/java/org/alfresco/repo/web/scripts/subscriptions/AbstractSubscriptionServiceWebScript.java b/source/java/org/alfresco/repo/web/scripts/subscriptions/AbstractSubscriptionServiceWebScript.java
index 0d6c9a251f..19f81ffb24 100644
--- a/source/java/org/alfresco/repo/web/scripts/subscriptions/AbstractSubscriptionServiceWebScript.java
+++ b/source/java/org/alfresco/repo/web/scripts/subscriptions/AbstractSubscriptionServiceWebScript.java
@@ -66,7 +66,8 @@ public abstract class AbstractSubscriptionServiceWebScript extends AbstractWebSc
     {
         if (!subscriptionService.isActive())
         {
-            throw new WebScriptException(404, "Subscription service is disabled!");
+            res.setStatus(404);
+            return;
         }
 
         try