Skip to content

Y
yii2
Commit daf6c81f by Qiang Xue
Options

Fixes #1791

parent f23a91b5
Showing with 9 additions and 3 deletions
framework/yii/db/ActiveQuery.php
...@@ -243,10 +243,16 @@ class ActiveQuery extends Query implements ActiveQueryInterface ...@@ -243,10 +243,16 @@ class ActiveQuery extends Query implements ActiveQueryInterface
unset($with[$name]); unset($with[$name]);
} }
} }
$this->with($with); } elseif (!$eagerLoading) {
} elseif ($eagerLoading) { $with = [];
$this->with($with);
} }
if (!empty($with)) {
foreach ($with as $name => $value) {
$this->with[$name] = $value;
}
}
return $this; return $this;
} }
......
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