Author: bayard
Date: Thu Mar 22 10:47:25 2007
New Revision: 521371
URL: http://svn.apache.org/viewvc?view=rev&rev=521371
Log:
Applying suggested change from bug 41852.
Modified:
jakarta/taglibs/proper/string/trunk/src/org/apache/taglibs/string/util/StringW.java
Modified:
jakarta/taglibs/proper/string/trunk/src/org/apache/taglibs/string/util/StringW.java
URL:
http://svn.apache.org/viewvc/jakarta/taglibs/proper/string/trunk/src/org/apache/taglibs/string/util/StringW.java?view=diff&rev=521371&r1=521370&r2=521371
==============================================================================
---
jakarta/taglibs/proper/string/trunk/src/org/apache/taglibs/string/util/StringW.java
(original)
+++
jakarta/taglibs/proper/string/trunk/src/org/apache/taglibs/string/util/StringW.java
Thu Mar 22 10:47:25 2007
@@ -261,7 +261,10 @@
{
// strip markup from the string
str = XmlW.removeXml(str);
-
+
+ // unescape temporarily for length handling
+ str = XmlW.unescapeXml(str);
+
// quickly adjust the upper if it is set lower than 'lower'
if(upper < lower) {
upper = lower;
@@ -288,7 +291,10 @@
// the string was truncated, so we append the
appendToEnd String
str = str + appendToEnd;
}
-
+
+ // escape after finished processing string
+ str = XmlW.escapeXml(str);
+
return str;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
