Browse Source

Fixes for broken tests

lilHermit 9 years ago
parent
commit
59a02e7695
2 changed files with 2 additions and 6 deletions
  1. 1 3
      src/View/Widget/MultiCheckboxWidget.php
  2. 1 3
      src/View/Widget/RadioWidget.php

+ 1 - 3
src/View/Widget/MultiCheckboxWidget.php

@@ -161,9 +161,7 @@ class MultiCheckboxWidget implements WidgetInterface
             if ($this->_isSelected($checkbox['value'], $data['val'])) {
                 $checkbox['checked'] = true;
             }
-            if ($this->_isDisabled($checkbox['value'], $data['disabled'])) {
-                $checkbox['disabled'] = true;
-            }
+            $checkbox['disabled'] = $this->_isDisabled($checkbox['value'], $data['disabled']);
             if (empty($checkbox['id'])) {
                 $checkbox['id'] = $this->_id($checkbox['name'], $checkbox['value']);
             }

+ 1 - 3
src/View/Widget/RadioWidget.php

@@ -173,9 +173,7 @@ class RadioWidget implements WidgetInterface
         if (isset($data['val']) && (string)$data['val'] === (string)$radio['value']) {
             $radio['checked'] = true;
         }
-        if ($this->_isDisabled($radio, $data['disabled'])) {
-            $radio['disabled'] = true;
-        }
+        $radio['disabled'] = $this->_isDisabled($radio, $data['disabled']);
         if (!empty($data['required'])) {
             $radio['required'] = true;
         }