Merge branch 'hotfix/4180'

Close #4180 Fixes #4136
zendframework · Apr 15, 2013 · a3c3297 · a3c3297
2 parents 49b82fd + 899c1a1
commit a3c3297
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/library/Zend/Form/View/Helper/FormMultiCheckbox.php b/library/Zend/Form/View/Helper/FormMultiCheckbox.php
@@ -257,10 +257,10 @@ protected function renderOptions(MultiCheckboxElement $element, array $options,
 
             $value           = '';
             $label           = '';
-            $selected        = false;
-            $disabled        = false;
             $inputAttributes = $attributes;
             $labelAttributes = $globalLabelAttributes;
+            $selected        = isset($inputAttributes['selected']) && $inputAttributes['type'] != 'radio' && $inputAttributes['selected'] != false ? true : false;
+            $disabled        = isset($inputAttributes['disabled']) && $inputAttributes['disabled'] != false ? true : false;
 
             if (is_scalar($optionSpec)) {
                 $optionSpec = array(

diff --git a/tests/ZendTest/Form/View/Helper/FormMultiCheckboxTest.php b/tests/ZendTest/Form/View/Helper/FormMultiCheckboxTest.php
@@ -364,4 +364,12 @@ public function testGetUncheckedValueSetToFoo()
         $uncheckedValue = $this->helper->getUncheckedValue();
         $this->assertSame('foo', $uncheckedValue);
     }
+
+    public function testGetDisableAttributeReturnTrue()
+    {
+        $element = new MultiCheckboxElement('foo');
+        $element->setAttribute('disabled', 'true' );
+        $this->assertSame('true', $element->getAttribute('disabled'));
+    }
+
 }