From e79af9117ee47835985d9e4fa600ce1c2f73163c Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Fri, 14 Feb 2014 10:07:19 -0500 Subject: [PATCH] ensure populateRelation() is called for lazy loading. --- framework/db/BaseActiveRecord.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/framework/db/BaseActiveRecord.php b/framework/db/BaseActiveRecord.php index 781d8a08d6..f48ef4a61b 100644 --- a/framework/db/BaseActiveRecord.php +++ b/framework/db/BaseActiveRecord.php @@ -238,7 +238,8 @@ abstract class BaseActiveRecord extends Model implements ActiveRecordInterface throw new InvalidParamException('Relation names are case sensitive. ' . get_class($this) . " has a relation named \"$realName\" instead of \"$name\"."); } } - return $this->_related[$name] = $value->multiple ? $value->all() : $value->one(); + $this->populateRelation($name, $value->multiple ? $value->all() : $value->one()); + return $this->_related[$name]; } return $value; }