Browse Source

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

FIX: Relation names not mangled in ActiveQuery::normalizeRelation
tags/2.0.0-beta
Qiang Xue 11 years ago
parent
commit
158ea21ea8
  1. 7
      framework/yii/db/ActiveQuery.php

7
framework/yii/db/ActiveQuery.php

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

Loading…
Cancel
Save