Skip to content

Commit

Permalink
Fixes #16527: Fixed return content for \yii\widgets\ActiveForm::run()
Browse files Browse the repository at this point in the history
  • Loading branch information
carono authored and samdark committed Jul 28, 2018
1 parent 901d249 commit 9d03667
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion framework/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Yii Framework 2 Change Log

2.0.16 under development
------------------------

- Bug #16527: Fixed return content for `\yii\widgets\ActiveForm::run()` (carono)
- Bug #15826: Fixed JavaScript compareValidator in `yii.validation.js` for attributes not in rules (mgrechanik)
- Enh #16365: Added $filterOnFocusOut option for GridView (s1lver)
- Enh #14289: Added `yii\db\Command::executeResetSequence()` to work with Oracle (CedricYii)
Expand Down
7 changes: 4 additions & 3 deletions framework/widgets/ActiveForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -221,14 +221,15 @@ public function run()
}

$content = ob_get_clean();
echo Html::beginForm($this->action, $this->method, $this->options);
echo $content;
$html = Html::beginForm($this->action, $this->method, $this->options);
$html .= $content;

if ($this->enableClientScript) {
$this->registerClientScript();
}

echo Html::endForm();
$html .= Html::endForm();
return $html;
}

/**
Expand Down

0 comments on commit 9d03667

Please sign in to comment.