Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed merge conflict.

This commit is contained in:
Taylor Otwell 2011-08-18 22:28:10 -05:00
parent 0a5c442295 b31f13d99f
commit 4569ebec46
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
changelog.md
View File

@ -1,5 +1,13 @@
# Laravel Change Log # Laravel Change Log
## Version 1.5.4
- Fix bug in Eloquent belongs_to relationship eager loading.
### Upgrading From 1.5.3
- Replace **system** directory.
## Version 1.5.3 ## Version 1.5.3
- Various bug fixes. - Various bug fixes.

10
laravel/db/eloquent/hydrator.php
View File

@ -66,13 +66,15 @@ private static function base($class, $results)
*/ */
private static function eagerly($eloquent, &$parents, $include) private static function eagerly($eloquent, &$parents, $include)
{ {
// We temporarily spoof the belongs_to key to allow the query to be fetched without // We temporarily spoof the query attributes to allow the query to be fetched without
// any problems, since the belongs_to method actually gets the attribute. // any problems, since the belongs_to method actually gets the related attribute.
$eloquent->attributes[$spoof = $include.'_id'] = 0; $first = reset($parents);
$eloquent->attributes = $first->attributes;
$relationship = $eloquent->$include(); $relationship = $eloquent->$include();
unset($eloquent->attributes[$spoof]); $eloquent->attributes = array();
// Reset the WHERE clause and bindings on the query. We'll add our own WHERE clause soon. // Reset the WHERE clause and bindings on the query. We'll add our own WHERE clause soon.
// This will allow us to load a range of related models instead of only one. // This will allow us to load a range of related models instead of only one.