From 9c0572bff9ba77dc56ee56b2e1879dc9363cfffb Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Wed, 5 Feb 2014 22:08:47 +0400
Subject: [PATCH] Fixed `$model->load($data)` returned `true` if `$data` and `formName` were empty
---
framework/CHANGELOG.md | 1 +
framework/base/Model.php | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md
index 1f91729..973ffee 100644
--- a/framework/CHANGELOG.md
+++ b/framework/CHANGELOG.md
@@ -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 `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 `$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 #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)
diff --git a/framework/base/Model.php b/framework/base/Model.php
index 2f3c982..8ec6e40 100644
--- a/framework/base/Model.php
+++ b/framework/base/Model.php
@@ -721,7 +721,7 @@ class Model extends Component implements IteratorAggregate, ArrayAccess, Arrayab
public function load($data, $formName = null)
{
$scope = $formName === null ? $this->formName() : $formName;
- if ($scope == '') {
+ if ($scope == '' && !empty($data)) {
$this->setAttributes($data);
return true;
} elseif (isset($data[$scope])) {
--
libgit2 0.27.1