From 4cdb9f49bccae91ee4b0c3cb103236e9825dd30a Mon Sep 17 00:00:00 2001 From: Stuart Lewis Date: Sun, 7 Dec 2008 07:54:21 +0000 Subject: [PATCH] (Stuart Lewis) Fix for SF bug [2343281] XHTML Head Dissimination Crosswalk exposes provenance info git-svn-id: http://scm.dspace.org/svn/repo/branches/dspace-1_5_x@3323 9c30dcfa-912a-0410-8fc2-9e0234be79fd --- .../content/crosswalk/XHTMLHeadDisseminationCrosswalk.java | 5 ++++- dspace/CHANGES | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/XHTMLHeadDisseminationCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/XHTMLHeadDisseminationCrosswalk.java index 6437b2d715..53ebbc8d2b 100644 --- a/dspace-api/src/main/java/org/dspace/content/crosswalk/XHTMLHeadDisseminationCrosswalk.java +++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/XHTMLHeadDisseminationCrosswalk.java @@ -232,6 +232,9 @@ public class XHTMLHeadDisseminationCrosswalk extends SelfNamedPlugin implements key = v.schema + "." + v.element; name = names.get(key); } + + // Do not include description.provenance + boolean provenance = "description".equals(v.element) && "provenance".equals(v.qualifier); if (name == null) { @@ -244,7 +247,7 @@ public class XHTMLHeadDisseminationCrosswalk extends SelfNamedPlugin implements : handle) + " field " + originalKey); } } - else + else if (provenance != true) { Element e = new Element("meta", XHTML_NAMESPACE); e.setAttribute("name", name); diff --git a/dspace/CHANGES b/dspace/CHANGES index 11a693ca27..b2d423cc73 100644 --- a/dspace/CHANGES +++ b/dspace/CHANGES @@ -2,6 +2,7 @@ - [2057231] Refactor LDAPServlet to use Stackable Authentication - Enable ldap.login.specialgroup special group for all LDAP users - Fix for SF bug [2164955] DSpace1.5.1(XML) problem with Login to restricted bitstreams + - Fix for SF bug [2343281] XHTML Head Dissimination Crosswalk exposes provenance info (Stuart Lewis / Chris Yates / Flavio Botelho / Alex Barbieri / Reuben Pasquini) - [2057378] Hierarchical LDAP support