From 9a03f4735cfc37517345fadbe09e91f97e9f88b6 Mon Sep 17 00:00:00 2001
From: Dave Ward <left@alfresco.com>
Date: Fri, 2 Dec 2011 22:38:49 +0000
Subject: [PATCH] Reverse merged revision 32469 / ALF-10182 due to compilation
 failure - sorry Matt!

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32495 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../scripts/blogs/AbstractBlogWebScript.java   | 18 ++++--------------
 .../web/scripts/blogs/posts/BlogPostsPost.java |  2 +-
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/source/java/org/alfresco/repo/web/scripts/blogs/AbstractBlogWebScript.java b/source/java/org/alfresco/repo/web/scripts/blogs/AbstractBlogWebScript.java
index 6bdb4e2e6c..95c03a5175 100644
--- a/source/java/org/alfresco/repo/web/scripts/blogs/AbstractBlogWebScript.java
+++ b/source/java/org/alfresco/repo/web/scripts/blogs/AbstractBlogWebScript.java
@@ -21,7 +21,6 @@ package org.alfresco.repo.web.scripts.blogs;
 import java.io.IOException;
 import java.util.Map;
 
-import org.alfresco.repo.activities.post.lookup.PostLookup;
 import org.alfresco.repo.blog.BlogServiceImpl;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.model.Repository;
@@ -37,7 +36,6 @@ import org.alfresco.service.cmr.site.SiteService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.json.JSONStringer;
-import org.json.JSONWriter;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
@@ -116,7 +114,7 @@ public abstract class AbstractBlogWebScript extends DeclarativeWebScript
      * @param event One of created, updated, deleted
      */
     protected void addActivityEntry(String event, BlogPostInfo blog, 
-          SiteInfo site, WebScriptRequest req, JSONObject json, NodeRef nodeRef)
+          SiteInfo site, WebScriptRequest req, JSONObject json)
     {
        // We can only add activities against a site
        if (site == null)
@@ -149,19 +147,11 @@ public abstract class AbstractBlogWebScript extends DeclarativeWebScript
        
        try
        {
-          JSONWriter jsonWriter = new JSONStringer()
+          String data = new JSONStringer()
               .object()
                   .key(TITLE).value(title)
-                  .key(PAGE).value(page);
-          
-          if (nodeRef != null)
-          {
-              // ALF-10182: the nodeRef needs to be included in the activity
-              // post to ensure read permissions are respected.
-              jsonWriter.key(PostLookup.JSON_NODEREF).value(nodeRef.toString());
-          }
-          
-          String data = jsonWriter.endObject().toString();
+                  .key(PAGE).value(page)
+              .endObject().toString();
           
           activityService.postActivity(
                 "org.alfresco.blog.post-" + event,
diff --git a/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsPost.java b/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsPost.java
index 6ed5c5b06d..b33366978a 100644
--- a/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsPost.java
+++ b/source/java/org/alfresco/repo/web/scripts/blogs/posts/BlogPostsPost.java
@@ -83,7 +83,7 @@ public class BlogPostsPost extends AbstractBlogWebScript
                 jsonPostParams.getPage() != null &&
                 !isDraft)
         {
-            addActivityEntry("created", post, site, req, json, nodeRef);
+            addActivityEntry("created", post, site, req, json);
         }
         
         return model;