Skip to content
Permalink
Browse files

Fixes for broken tests

  • Loading branch information...
lilHermit committed Feb 8, 2017
1 parent 116f799 commit 59a02e7695fe8da26d21f254cbe2b5692b49001e
Showing with 2 additions and 6 deletions.
  1. +1 −3 src/View/Widget/MultiCheckboxWidget.php
  2. +1 −3 src/View/Widget/RadioWidget.php
@@ -161,9 +161,7 @@ protected function _renderInputs($data, $context)
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']);
}
@@ -173,9 +173,7 @@ protected function _renderInput($val, $text, $data, $context)
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;
}

0 comments on commit 59a02e7

Please sign in to comment.
You can’t perform that action at this time.