Skip to content

Y
yii2
Commit 158ea21e by Qiang Xue
Options

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

FIX: Relation names not mangled in ActiveQuery::normalizeRelation
parents baaab4e0 365bdcf6
Showing with 3 additions and 4 deletions
framework/yii/db/ActiveQuery.php
...@@ -308,13 +308,12 @@ class ActiveQuery extends Query ...@@ -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)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment