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

Merge pull request #1171 from mcd-php/fix-relation-strtolower

Browse Source 
FIX: Relation names not mangled in ActiveQuery::normalizeRelation
This commit is contained in:
Qiang Xue
2013-11-11 06:20:19 -08:00
parent baaab4e09f 365bdcf68a
commit 158ea21ea8
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
framework/yii/db/ActiveQuery.php
View File

@ -308,13 +308,12 @@ class ActiveQuery extends Query
$childName = null; $childName = null;
} }
$t = strtolower($name); if (!isset($relations[$name])) {
if (!isset($relations[$t])) {
$relation = $model->getRelation($name); $relation = $model->getRelation($name);
$relation->primaryModel = null; $relation->primaryModel = null;
$relations[$t] = $relation; $relations[$name] = $relation;
} else { } else {
$relation = $relations[$t]; $relation = $relations[$name];
} }
if (isset($childName)) { if (isset($childName)) {