From cddb87836062626c3d73c340e3323aa6b64aed77 Mon Sep 17 00:00:00 2001 From: Klimov Paul Date: Sun, 1 Dec 2013 17:46:21 +0200 Subject: [PATCH] ActiveRelationTrait::getModelKey() updated to work with non scalar keys. --- framework/yii/db/ActiveRelationTrait.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/framework/yii/db/ActiveRelationTrait.php b/framework/yii/db/ActiveRelationTrait.php index 832bb62..c477df9 100644 --- a/framework/yii/db/ActiveRelationTrait.php +++ b/framework/yii/db/ActiveRelationTrait.php @@ -203,7 +203,8 @@ trait ActiveRelationTrait return serialize($key); } else { $attribute = reset($attributes); - return $model[$attribute]; + $key = $model[$attribute]; + return is_scalar($key) ? $key : serialize($key); } }