You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2010/04/03 23:09:19 UTC
svn commit: r930581 -
/myfaces/shared/trunk_4.0.x/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
Author: lu4242
Date: Sat Apr 3 21:09:19 2010
New Revision: 930581
URL: http://svn.apache.org/viewvc?rev=930581&view=rev
Log:
MYFACES-2508 - revert fix on labels not being properly escaped, because the code committed replace '&' chars with & when escape=false on a f:selectItem tag inside a h:selectOneRadio
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=930581&r1=930580&r2=930581&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 Sat Apr 3 21:09:19 2010
@@ -1580,11 +1580,13 @@ public final class HtmlRendererUtils {
writer.write(" ");
if(item.isEscape())
{
- writer.write(item.getLabel());
+ //writer.write(item.getLabel());
+ writer.writeText(item.getLabel(), null);
}
else
{
- writer.write(HTMLEncoder.encode (item.getLabel()));
+ //writer.write(HTMLEncoder.encode (item.getLabel()));
+ writer.write(item.getLabel());
}
}
@@ -1648,11 +1650,13 @@ public final class HtmlRendererUtils {
writer.write(HTML.NBSP_ENTITY);
if(item.isEscape())
{
- writer.write(item.getLabel());
+ //writer.write(item.getLabel());
+ writer.writeText(item.getLabel(), null);
}
else
{
- writer.write(HTMLEncoder.encode (item.getLabel()));
+ //writer.write(HTMLEncoder.encode (item.getLabel()));
+ writer.write(item.getLabel());
}
}