Skip to content

Commit

Permalink
[HttpFoundation] tweaked previous merge
Browse files Browse the repository at this point in the history
  • Loading branch information
fabpot committed Jul 4, 2011
1 parent 88bee2b commit 311a9bd
Showing 1 changed file with 1 addition and 2 deletions.
Expand Up @@ -43,15 +43,14 @@ public function __construct(array $options = array())
$cookieDefaults = session_get_cookie_params();

$this->options = array_merge(array(
'name' => null,
'lifetime' => $cookieDefaults['lifetime'],
'path' => $cookieDefaults['path'],
'domain' => $cookieDefaults['domain'],
'secure' => $cookieDefaults['secure'],
'httponly' => isset($cookieDefaults['httponly']) ? $cookieDefaults['httponly'] : false,
), $options);

// Skip setting new session name if user don't wan't it
// Skip setting new session name if user don't want it
if (isset($this->options['name'])) {
session_name($this->options['name']);
}
Expand Down

0 comments on commit 311a9bd

Please sign in to comment.