ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing merge issues

Browse Source
This commit is contained in:
Dayle Rees
2012-07-27 13:52:15 +01:00
parent da35e257fd b325e954e3
commit 2c6ed23b45
48 changed files with 101 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
laravel/database/eloquent/query.php
View File

@@ -141,7 +141,7 @@ class Query {
}
}
// The many to many relationships may have pivot table column on them
// The many to many relationships may have pivot table columns on them
// so we will call the "clean" method on the relationship to remove
// any pivot columns that are on the model.
if ($this instanceof Relationships\Has_Many_And_Belongs_To)
@@ -199,7 +199,7 @@ class Query {
foreach ($this->model_includes() as $include => $constraints)
{
// To get the nested includes, we want to find any includes that begin
// the relationship and a dot, then we will strip off the leading
// the relationship with a dot, then we will strip off the leading
// nesting indicator and set the include in the array.
if (starts_with($include, $relationship.'.'))
{
@@ -278,4 +278,4 @@ class Query {
return $this;
}
}
}