php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-20 18:32:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed test break.

Browse Source
This commit is contained in:
Qiang Xue
2013-11-24 11:52:50 -05:00
parent 858326c074
commit e4e376ba28
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/yii/base/Model.php
View File

@ -214,17 +214,13 @@ class Model extends Component implements IteratorAggregate, ArrayAccess
} }
foreach ($scenarios as $scenario => $attributes) { foreach ($scenarios as $scenario => $attributes) {
if (empty($attributes)) { if (empty($attributes) && $scenario !== self::DEFAULT_SCENARIO) {
unset($scenarios[$scenario]); unset($scenarios[$scenario]);
} else { } else {
$scenarios[$scenario] = array_keys($attributes); $scenarios[$scenario] = array_keys($attributes);
} }
} }
if (empty($scenarios[self::DEFAULT_SCENARIO])) {
// keep the default scenario so that models without any rules defined can work properly
$scenarios[self::DEFAULT_SCENARIO] = [];
}
return $scenarios; return $scenarios;
} }