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

fixed conflicts.

This commit is contained in:
Taylor Otwell 2011-08-24 21:53:49 -05:00
parent f580ef7f71 812d3ff51f
commit 99adf09ac7
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
changelog.md
View File

@ -1,5 +1,13 @@
# Laravel Change Log
## Version 1.5.5
- Fix bug in session class cookie option extraction.
### Upgrading From 1.5.4
- Replace **system** directory.
## Version 1.5.4
- Fix bug in Eloquent belongs_to relationship eager loading.

2
laravel/session/driver.php
View File

@ -233,7 +233,7 @@ protected function write_cookie()
{
$minutes = (Config::get('session.expire_on_close')) ? 0 : Config::get('session.lifetime');
Cookie::put('laravel_session', static::$session['id'], $minutes, Config::get('session.path'), Config::get('session.domain'), Config::get('session.https'), Config::get('http_only'));
Cookie::put('laravel_session', static::$session['id'], $minutes, Config::get('session.path'), Config::get('session.domain'), Config::get('session.https'), Config::get('session.http_only'));
}
}