Author: bayard Date: Mon Aug 6 23:08:19 2007 New Revision: 563398 URL: http://svn.apache.org/viewvc?view=rev&rev=563398 Log: Applying my patch from STR-1195
Modified: struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/SelectTag.java struts/struts1/trunk/taglib/src/main/resources/META-INF/tld/struts-html.tld Modified: struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/SelectTag.java URL: http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/SelectTag.java?view=diff&rev=563398&r1=563397&r2=563398 ============================================================================== --- struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/SelectTag.java (original) +++ struts/struts1/trunk/taglib/src/main/java/org/apache/struts/taglib/html/SelectTag.java Mon Aug 6 23:08:19 2007 @@ -52,8 +52,8 @@ protected String[] match = null; /** - * Should multiple selections be allowed. Any non-null value will trigger - * rendering this. + * Should multiple selections be allowed. Any non-null value except for 'false' + * will trigger rendering this. */ protected String multiple = null; @@ -192,7 +192,7 @@ prepareAttribute(results, "name", prepareName()); prepareAttribute(results, "accesskey", getAccesskey()); - if (multiple != null) { + if (multiple != null && !multiple.equals("false")) { results.append(" multiple=\"multiple\""); } Modified: struts/struts1/trunk/taglib/src/main/resources/META-INF/tld/struts-html.tld URL: http://svn.apache.org/viewvc/struts/struts1/trunk/taglib/src/main/resources/META-INF/tld/struts-html.tld?view=diff&rev=563398&r1=563397&r2=563398 ============================================================================== --- struts/struts1/trunk/taglib/src/main/resources/META-INF/tld/struts-html.tld (original) +++ struts/struts1/trunk/taglib/src/main/resources/META-INF/tld/struts-html.tld Mon Aug 6 23:08:19 2007 @@ -7906,7 +7906,7 @@ affects the data type of the associated property you should use:</p> <ul> - <li><em>multiple="true" IS NOT selected</em> - + <li><em>multiple="false" or multiple IS NOT selected</em> - The corresponding property should be a scalar value of any supported data type.</li> <li><em>multiple="true" IS selected</em> - @@ -8088,8 +8088,8 @@ <rtexprvalue>true</rtexprvalue> <description> <![CDATA[ - If set to any arbitrary value, the rendered - select element will support + If set to any arbitrary value except 'false, + the rendered select element will support multiple selections. ]]> </description>