php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-15 13:58:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/yiisoft/yii2

Browse Source
This commit is contained in:
Qiang Xue
2014-03-26 11:19:11 -04:00
parent 78136d4278 f93d871cd6
commit 2105f092f3
11 changed files with 25 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
framework/db/BaseActiveRecord.php
View File

@@ -81,7 +81,8 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
*/
private $_attributes = [];
/**
* @var array old attribute values indexed by attribute names.
* @var array|null old attribute values indexed by attribute names.
* This is `null` if the record [[isNewRecord|is new]].
*/
private $_oldAttributes;
/**
@@ -475,7 +476,7 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
/**
* Sets the old attribute values.
* All existing old attribute values will be discarded.
* @param array $values old attribute values to be set.
* @param array|null $values old attribute values to be set.
*/
public function setOldAttributes($values)
{
@@ -1304,8 +1305,8 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface
/**
* @param array $link
* @param BaseActiveRecord $foreignModel
* @param BaseActiveRecord $primaryModel
* @param ActiveRecordInterface $foreignModel
* @param ActiveRecordInterface $primaryModel
* @throws InvalidCallException
*/
private function bindModels($link, $foreignModel, $primaryModel)