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 10:34:16 -05:00
parent 232bf01ae2 250541b22b
commit e78c90b993
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

1
laravel/documentation/changes.md
View File

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