From 1856df30c8820836c221efe1714c52afccb3a72f Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 5 May 2013 18:46:39 +0200 Subject: [PATCH] [Security] fixed wrong merge (refs #4776) --- .../DependencyInjection/Security/Factory/AbstractFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php index 08e137118e..27f08b0a1f 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php @@ -29,6 +29,7 @@ abstract class AbstractFactory implements SecurityFactoryInterface protected $options = array( 'check_path' => '/login_check', 'use_forward' => false, + 'require_previous_session' => true, ); protected $defaultSuccessHandlerOptions = array( @@ -44,7 +45,6 @@ abstract class AbstractFactory implements SecurityFactoryInterface 'failure_forward' => false, 'login_path' => '/login', 'failure_path_parameter' => '_failure_path', - 'require_previous_session' => true, ); public function create(ContainerBuilder $container, $id, $config, $userProviderId, $defaultEntryPointId)