Commit 9c0572bf by Alexander Makarov

Fixed `$model->load($data)` returned `true` if `$data` and `formName` were empty

parent 6a39cc65
...@@ -52,6 +52,7 @@ Yii Framework 2 Change Log ...@@ -52,6 +52,7 @@ Yii Framework 2 Change Log
- Bug: Fixed URL parsing so it's now properly giving 404 for URLs like `http://example.com//////site/about` (samdark) - Bug: Fixed URL parsing so it's now properly giving 404 for URLs like `http://example.com//////site/about` (samdark)
- Bug: Fixed `HelpController::getModuleCommands` issue where it attempts to scan a module's controller directory when it doesn't exist (jom) - Bug: Fixed `HelpController::getModuleCommands` issue where it attempts to scan a module's controller directory when it doesn't exist (jom)
- Bug: Fixed an issue with Filehelper and not accessable directories which resulted in endless loop (cebe) - Bug: Fixed an issue with Filehelper and not accessable directories which resulted in endless loop (cebe)
- Bug: Fixed `$model->load($data)` returned `true` if `$data` and `formName` were empty (samdark)
- Enh #46: Added Image extension based on [Imagine library](http://imagine.readthedocs.org) (tonydspaniard) - Enh #46: Added Image extension based on [Imagine library](http://imagine.readthedocs.org) (tonydspaniard)
- Enh #364: Improve Inflector::slug with `intl` transliteration. Improved transliteration char map. (tonydspaniard) - Enh #364: Improve Inflector::slug with `intl` transliteration. Improved transliteration char map. (tonydspaniard)
- Enh #797: Added support for validating multiple columns by `UniqueValidator` and `ExistValidator` (qiangxue) - Enh #797: Added support for validating multiple columns by `UniqueValidator` and `ExistValidator` (qiangxue)
......
...@@ -721,7 +721,7 @@ class Model extends Component implements IteratorAggregate, ArrayAccess, Arrayab ...@@ -721,7 +721,7 @@ class Model extends Component implements IteratorAggregate, ArrayAccess, Arrayab
public function load($data, $formName = null) public function load($data, $formName = null)
{ {
$scope = $formName === null ? $this->formName() : $formName; $scope = $formName === null ? $this->formName() : $formName;
if ($scope == '') { if ($scope == '' && !empty($data)) {
$this->setAttributes($data); $this->setAttributes($data);
return true; return true;
} elseif (isset($data[$scope])) { } elseif (isset($data[$scope])) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment