Merge branch 'develop' into feature/http-foundation

laravel/database/eloquent/relationships/has_many_and_belongs_to.php

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

laravel/documentation/changes.md

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