svn commit: r1171897 - /wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java

[ivaynberg]

Author: ivaynberg
Date: Sat Sep 17 05:30:10 2011
New Revision: 1171897

URL: http://svn.apache.org/viewvc?rev=1171897&view=rev
Log:

Issue: WICKET-4059

Modified:
    
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java

Modified: 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java?rev=1171897&r1=1171896&r2=1171897&view=diff
==============================================================================
--- 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
 (original)
+++ 
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/form/CheckBoxMultipleChoice.java
 Sat Sep 17 05:30:10 2011
@@ -400,7 +400,7 @@ public class CheckBoxMultipleChoice<T> e
                        {
                                buffer.append(" checked=\"checked\"");
                        }
-                       if (isDisabled(choice, index, selected))
+                       if (isDisabled(choice, index, selected) || 
!isEnabledInHierarchy())
                        {
                                buffer.append(" disabled=\"disabled\"");
                        }