You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mc...@apache.org on 2010/03/17 19:59:59 UTC
svn commit: r924420 -
/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
Author: mconcini
Date: Wed Mar 17 18:59:59 2010
New Revision: 924420
URL: http://svn.apache.org/viewvc?rev=924420&view=rev
Log:
MYFACES-2508 - fix for labels not being escaped properly.
Modified:
myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
Modified: myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java?rev=924420&r1=924419&r2=924420&view=diff
==============================================================================
--- myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java (original)
+++ myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java Wed Mar 17 18:59:59 2010
@@ -1579,11 +1579,11 @@ public final class HtmlRendererUtils {
writer.write(" ");
if(item.isEscape())
{
- writer.writeText(item.getLabel(), null);
+ writer.write(item.getLabel());
}
else
{
- writer.write(item.getLabel());
+ writer.write(HTMLEncoder.encode (item.getLabel()));
}
}
@@ -1647,11 +1647,11 @@ public final class HtmlRendererUtils {
writer.write(HTML.NBSP_ENTITY);
if(item.isEscape())
{
- writer.writeText(item.getLabel(), null);
+ writer.write(item.getLabel());
}
else
{
- writer.write(item.getLabel());
+ writer.write(HTMLEncoder.encode (item.getLabel()));
}
}