diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merged branch fabpot/require-previous-session (PR #7938)

Browse Source 
This PR was merged into the master branch.

Discussion
----------

[Security] fixed wrong merge (refs #4776)

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | n/a
| License       | MIT
| Doc PR        | n/a

This fixes a bad conflict resolution when #4776 was merged.

Commits
-------

1856df3 [Security] fixed wrong merge (refs #4776)
This commit is contained in:
Fabien Potencier 2013-05-05 21:59:18 +02:00
commit 674b30fafe
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Bundle/SecurityBundle/DependencyInjection/Security/Factory/AbstractFactory.php
View File

@ -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)