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

2
laravel/database/eloquent/model.php
View File

@@ -753,7 +753,7 @@ abstract class Model {
{
$meta = array('key', 'table', 'connection', 'sequence', 'per_page', 'timestamps');
// If the method is actually the name of a static property on the model we'll
// If the method is actually the name of a static property on the model, we'll
// return the value of the static property. This makes it convenient for
// relationships to access these values off of the instances.
if (in_array($method, $meta))

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;
}
}
}

4
laravel/database/eloquent/relationships/has_many_and_belongs_to.php
View File

@@ -44,7 +44,7 @@ class Has_Many_And_Belongs_To extends Relationship {
$this->joining = $table ?: $this->joining($model, $associated);
// If the Pivot table is timestamped, we'll set the timestamp columns to be
// fetched when the pivot table models are fetched by the developer else
// fetched when the pivot table models are fetched by the developer, or else
// the ID will be the only "extra" column fetched in by default.
if (Pivot::$timestamps)
{
@@ -131,7 +131,7 @@ class Has_Many_And_Belongs_To extends Relationship {
}
// Next we will take the difference of the current and given IDs and detach
// all of the entities that exists in the current array but are not in
// all of the entities that exist in the current array but are not in
// the array of IDs given to the method, finishing the sync.
$detach = array_diff($current, $ids);