From 311a9bd02bd9b0304f8b3e72e6f4f290d2b1e53b Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Mon, 4 Jul 2011 16:26:19 +0200 Subject: [PATCH] [HttpFoundation] tweaked previous merge --- .../HttpFoundation/SessionStorage/NativeSessionStorage.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpFoundation/SessionStorage/NativeSessionStorage.php b/src/Symfony/Component/HttpFoundation/SessionStorage/NativeSessionStorage.php index 8ff04ca844fe..260c2bcd4af8 100644 --- a/src/Symfony/Component/HttpFoundation/SessionStorage/NativeSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/SessionStorage/NativeSessionStorage.php @@ -43,7 +43,6 @@ 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'], @@ -51,7 +50,7 @@ public function __construct(array $options = array()) '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']); }