bug #3866 [Book][Security]fixed Login when there is no session. (aitboudad)

weaverryan · weaverryan · commit 259a2b7a891b · 2014-05-29T08:37:09.000-05:00
This PR was merged into the 2.3 branch. Discussion ---------- [Book][Security]fixed Login when there is no session. | Q | A | ------------- | --- | Doc fix? | yes | New docs? | no | Applies to | all |Fixed tickets | - Commits ------- a7b8bc4 [Security]fixed Login when there is no session.
diff --git a/book/security.rst b/book/security.rst
@@ -449,16 +449,21 @@ Next, create the controller that will display the login form::
                 $error = $request->attributes->get(
                     SecurityContextInterface::AUTHENTICATION_ERROR
                 );
-            } else {
+            } elseif (null !== $session && $session->has(SecurityContextInterface::AUTHENTICATION_ERROR)) {
                 $error = $session->get(SecurityContextInterface::AUTHENTICATION_ERROR);
                 $session->remove(SecurityContextInterface::AUTHENTICATION_ERROR);
+            } else {
+                $error = '';
             }
+            
+            // last username entered by the user
+            $lastUsername = (null === $session) ? '' : $session->get(SecurityContextInterface::LAST_USERNAME);
 
             return $this->render(
                 'AcmeSecurityBundle:Security:login.html.twig',
                 array(
                     // last username entered by the user
-                    'last_username' => $session->get(SecurityContextInterface::LAST_USERNAME),
+                    'last_username' => $lastUsername,
                     'error'         => $error,
                 )
             );
