Merge branch 'develop' into feature/http-foundation

This commit is contained in:
Taylor Otwell 2012-04-04 10:34:16 -05:00
commit e78c90b993
2 changed files with 3 additions and 2 deletions

View File

@ -698,11 +698,11 @@ public function __call($method, $parameters)
// to perform the appropriate action based on the method.
if (starts_with($method, 'get_'))
{
return $this->attributes[substr($method, 4)];
return $this->get_attribute(substr($method, 4));
}
elseif (starts_with($method, 'set_'))
{
$this->attributes[substr($method, 4)] = $parameters[0];
$this->set_attribute(substr($method, 4), $parameters[0]);
}
// Finally we will assume that the method is actually the beginning of a

View File

@ -28,6 +28,7 @@ ## Laravel 3.2
- Fixed replacement of optional parameters in URL::transpose method.
- 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.
<a name="upgrade-3.2"></a>
## Upgrading From 3.1