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

Merge branch 'develop' into feature/http-foundation

This commit is contained in:
Taylor Otwell 2012-04-04 11:16:44 -05:00
parent 02ad4c5c47 63e6d143fb
commit 9499758806
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,7 @@ class Has_Many_And_Belongs_To extends Relationship {
* *
* @var array * @var array
*/ */
protected $with = array('id', 'created_at', 'updated_at'); protected $with = array();
/** /**
* Create a new many to many relationship instance. * Create a new many to many relationship instance.
@ -43,6 +43,11 @@ public function __construct($model, $associated, $table, $foreign, $other)
$this->joining = $table ?: $this->joining($model, $associated); $this->joining = $table ?: $this->joining($model, $associated);
if (Pivot::$timestamps)
{
$this->with = array('id', 'created_at', 'updated_at');
}
parent::__construct($model, $associated, $foreign); parent::__construct($model, $associated, $foreign);
} }

1
laravel/documentation/changes.md
View File

@ -29,6 +29,7 @@ ## Laravel 3.2
- Improved View performance by only loading contents from file once. - Improved View performance by only loading contents from file once.
- Fix handling of URLs beginning with has in URL::to. - Fix handling of URLs beginning with has in URL::to.
- Fix the resolution of unset Eloquent attributes. - Fix the resolution of unset Eloquent attributes.
- Allows pivot table timestamps to be disabled.
<a name="upgrade-3.2"></a> <a name="upgrade-3.2"></a>
## Upgrading From 3.1 ## Upgrading From 3.1