diff --git a/dspace/jsp/mydspace/main.jsp b/dspace/jsp/mydspace/main.jsp
index e8b4578038..c610f8e989 100644
--- a/dspace/jsp/mydspace/main.jsp
+++ b/dspace/jsp/mydspace/main.jsp
@@ -61,6 +61,7 @@
<%@ page import="org.dspace.content.DCValue" %>
<%@ page import="org.dspace.content.Item" %>
<%@ page import="org.dspace.content.WorkspaceItem" %>
+<%@ page import="org.dspace.core.Utils" %>
<%@ page import="org.dspace.eperson.EPerson" %>
<%@ page import="org.dspace.workflow.WorkflowItem" %>
<%@ page import="org.dspace.workflow.WorkflowManager" %>
@@ -144,7 +145,7 @@
}
%>
-
<%= title %> |
+ <%= Utils.addEntities(title) %> |
<%= owned[i].getCollection().getMetadata("name") %> |
<%= submitter.getFullName() %> |
@@ -209,7 +210,7 @@
}
%>
|
- <%= title %> |
+ <%= Utils.addEntities(title) %> |
<%= pooled[i].getCollection().getMetadata("name") %> |
<%= submitter.getFullName() %> |
@@ -272,7 +273,7 @@
|
- <%= title %> |
+ <%= Utils.addEntities(title) %> |
<%= workspaceItems[i].getCollection().getMetadata("name") %>
|
@@ -317,7 +318,7 @@
- <%= title %> |
+ <%= Utils.addEntities(title) %> |
<%= workflowItems[i].getCollection().getMetadata("name") %>
|
diff --git a/dspace/jsp/submit/review.jsp b/dspace/jsp/submit/review.jsp
index 75d9572906..e7661cb0f0 100644
--- a/dspace/jsp/submit/review.jsp
+++ b/dspace/jsp/submit/review.jsp
@@ -58,6 +58,7 @@
<%@ page import="org.dspace.content.DCLanguage" %>
<%@ page import="org.dspace.content.DCValue" %>
<%@ page import="org.dspace.content.Item" %>
+<%@ page import="org.dspace.core.Utils" %>
<%@ taglib uri="http://www.dspace.org/dspace-tags.tld" prefix="dspace" %>
@@ -157,7 +158,7 @@
for (int i = 0; i < authors.length; i++)
{
%>
- <%= authors[i].value %>
+ <%= Utils.addEntities(authors[i].value) %>
<%
}
}
@@ -175,7 +176,7 @@
Title: |
- <%= title %>
+ <%= Utils.addEntities(title) %>
|
<%
@@ -198,7 +199,7 @@
for(int i = 0; i < altTitles.length ; i++)
{
%>
- <%= altTitles[i].value %>
+ <%= Utils.addEntities(altTitles[i].value) %>
<%
}
}
@@ -248,7 +249,7 @@
else
{
%>
- <%= publisher[0].value %>
+ <%= Utils.addEntities(publisher[0].value) %>
<%
}
%>
@@ -270,7 +271,7 @@
else
{
%>
- <%= citation[0].value %>
+ <%= Utils.addEntities(citation[0].value) %>
<%
}
%>
@@ -295,7 +296,7 @@
for (int i = 0; i < seriesNumbers.length ; i++)
{
%>
- <%= seriesNumbers[i].value %>
+ <%= Utils.addEntities(seriesNumbers[i].value) %>
<%
}
}
@@ -314,7 +315,7 @@
if (!identifiers[i].qualifier.equals("citation"))
{
%>
- <%= identifierQualNames.get(identifiers[i].qualifier) %>: <%= identifiers[i].value %>
+ <%= identifierQualNames.get(identifiers[i].qualifier) %>: <%= Utils.addEntities(identifiers[i].value) %>
<%
}
}
@@ -382,7 +383,7 @@
for (int i = 0; i < keywords.length; i++)
{
%>
-<%= keywords[i].value %>
+<%= Utils.addEntities(keywords[i].value) %>
<%
}
}
@@ -395,15 +396,15 @@
Abstract: |
- <%= (abstr.length == 0 ? "None" : abstr[0].value) %> |
+ <%= (abstr.length == 0 ? "None" : Utils.addEntities(abstr[0].value)) %> |
Sponsors: |
- <%= (sponsors.length == 0 ? "None" : sponsors[0].value) %> |
+ <%= (sponsors.length == 0 ? "None" : Utils.addEntities(sponsors[0].value)) %> |
Other Description: |
- <%= (otherDesc.length == 0 ? "None" : otherDesc[0].value) %> |
+ <%= (otherDesc.length == 0 ? "None" : Utils.addEntities(otherDesc[0].value)) %> |