From 2f77a9c25efe3f06c1f08249921b83e8324052f2 Mon Sep 17 00:00:00 2001
From: Gavin Cornwell <gavin.cornwell@alfresco.com>
Date: Tue, 9 Sep 2008 10:19:26 +0000
Subject: [PATCH] Proper fix for SLNG-1166

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10864 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../org/alfresco/repository/store/content.get.desc.xml      | 6 +++---
 .../org/alfresco/repo/web/scripts/content/ContentGet.java   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/store/content.get.desc.xml b/config/alfresco/templates/webscripts/org/alfresco/repository/store/content.get.desc.xml
index aa8b8e12d5..a1dd43af62 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/store/content.get.desc.xml
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/store/content.get.desc.xml
@@ -20,9 +20,9 @@ Some CMIS protocol bindings MAY choose not to explicitly implement a “getConte
 Each CMIS protocol binding will provide a way for fetching a  sub-range within a content stream, in a manner appropriate to that protocol.<br> 
 ]]>
   </description>
-  <url>/api/node/content{property}/{store_type}/{store_id}/{node_id}?a={attach?}</url>
-  <url>/api/path/content{property}/{store_type}/{store_id}/{path}?a={attach?}</url>
-  <url>/api/avmpath/content{property}/{store_id}/{path}?a={attach?}</url>
+  <url>/api/node/content{property}/{store_type}/{store_id}/{id}?a={attach?}</url>
+  <url>/api/path/content{property}/{store_type}/{store_id}/{id}?a={attach?}</url>
+  <url>/api/avmpath/content{property}/{store_id}/{id}?a={attach?}</url>
   <url>/api/node/{store_type}/{store_id}/{id}/content{property}?a={attach?}</url>
   <url>/api/path/{store_type}/{store_id}/{id}/content{property}?a={attach?}</url>
   <authentication>guest</authentication>
diff --git a/source/java/org/alfresco/repo/web/scripts/content/ContentGet.java b/source/java/org/alfresco/repo/web/scripts/content/ContentGet.java
index 2399dc51d4..5330c8ad6c 100644
--- a/source/java/org/alfresco/repo/web/scripts/content/ContentGet.java
+++ b/source/java/org/alfresco/repo/web/scripts/content/ContentGet.java
@@ -89,7 +89,7 @@ public class ContentGet extends StreamContent
         String match = req.getServiceMatch().getPath();
         String[] matchParts = match.split("/");
         Map<String, String> templateVars = req.getServiceMatch().getTemplateVars();
-        String[] id = templateVars.get("node_id").split("/");
+        String[] id = templateVars.get("id").split("/");
         String[] path = new String[id.length + 2];
         path[0] = templateVars.get("store_type");
         path[1] = templateVars.get("store_id");