fixed conflicts.

This commit is contained in:
Taylor Otwell
2011-08-24 21:53:49 -05:00
2 changed files with 9 additions and 1 deletions

View File

@@ -233,7 +233,7 @@ abstract class Driver {
{
$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'));
}
}