Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Goldthorpe2011-02-18 20:02:31 +0000
committerChris Goldthorpe2011-02-18 20:02:31 +0000
commit07b42a5cea281c2b3c92562693a43e594d9b5d32 (patch)
tree96a6c2e7f82c3b4318e078f6fc44e7ce2e747ec2 /org.eclipse.help.webapp/advanced
parent09daa7362a5415c25a74de39c4364c539b7d6f17 (diff)
downloadeclipse.platform.ua-07b42a5cea281c2b3c92562693a43e594d9b5d32.tar.gz
eclipse.platform.ua-07b42a5cea281c2b3c92562693a43e594d9b5d32.tar.xz
eclipse.platform.ua-07b42a5cea281c2b3c92562693a43e594d9b5d32.zip
Bug 337605 - [Webapp] need to encode strings containing scope name
Diffstat (limited to 'org.eclipse.help.webapp/advanced')
-rw-r--r--org.eclipse.help.webapp/advanced/indexView.jsp2
-rw-r--r--org.eclipse.help.webapp/advanced/searchView.jsp4
-rw-r--r--org.eclipse.help.webapp/advanced/tocView.jsp2
3 files changed, 4 insertions, 4 deletions
diff --git a/org.eclipse.help.webapp/advanced/indexView.jsp b/org.eclipse.help.webapp/advanced/indexView.jsp
index 1714da48c..1d13a5783 100644
--- a/org.eclipse.help.webapp/advanced/indexView.jsp
+++ b/org.eclipse.help.webapp/advanced/indexView.jsp
@@ -71,7 +71,7 @@ var loadingMessage = "<%=UrlUtil.JavaScriptEncode(ServletResources.getString("Lo
<p>
<tr>
<td colspan="2">
-<%= searchData.getScopeActiveMessage() %>
+<%= UrlUtil.htmlEncode(searchData.getScopeActiveMessage()) %>
<a class="showall" onclick="showAll();" ><%=ServletResources.getString("showAllLink", request)%></a>
</p></td></tr>
<%
diff --git a/org.eclipse.help.webapp/advanced/searchView.jsp b/org.eclipse.help.webapp/advanced/searchView.jsp
index 336937cea..51644a2ca 100644
--- a/org.eclipse.help.webapp/advanced/searchView.jsp
+++ b/org.eclipse.help.webapp/advanced/searchView.jsp
@@ -127,7 +127,7 @@ setTimeout('refresh()', 2000);
<%
return;
} else if (data.getResultsCount() == 0){
- out.write(data.getNotFoundMessage());
+ out.write(UrlUtil.htmlEncode(data.getNotFoundMessage()));
if (data.isScopeActive()) {
%>
<a class="showall" onclick="showAll();" ><%=ServletResources.getString("showAllLink", request)%></a>
@@ -135,7 +135,7 @@ setTimeout('refresh()', 2000);
}
} else { // data.getResultsCount() != 0
%>
-<p><b><%=data.getMatchesInScopeMessage()%></b>
+<p><b><%=UrlUtil.htmlEncode(data.getMatchesInScopeMessage())%></b>
<%
if (data.isScopeActive()) {
%>
diff --git a/org.eclipse.help.webapp/advanced/tocView.jsp b/org.eclipse.help.webapp/advanced/tocView.jsp
index a188dffea..a0e1b9ca1 100644
--- a/org.eclipse.help.webapp/advanced/tocView.jsp
+++ b/org.eclipse.help.webapp/advanced/tocView.jsp
@@ -136,7 +136,7 @@ if (requestData.isIE()){
if (searchData.isScopeActive()) {
%>
<p>
-<%= searchData.getScopeActiveMessage() %>
+<%= UrlUtil.htmlEncode(searchData.getScopeActiveMessage()) %>
<a class="showall" onclick="showAll();" ><%=ServletResources.getString("showAllLink", request)%></a>
</p>
<%

Back to the top