diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2011-08-14 10:54:09 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2011-08-14 10:54:09 +0200 |
| commit | d06bc2e2354a570a2754ef3186c7cde848f5677c (patch) | |
| tree | dc808d567e4d0ebae2c4cec115771dfd61397d6c /Core/Encoder/BasePasswordEncoder.php | |
| parent | fa4b69a12979d49baeb177c81da1c318de361df2 (diff) | |
| parent | 8791cf2de673ca3b066c37cb9988cd9fe52d177f (diff) | |
| download | symfony-security-d06bc2e2354a570a2754ef3186c7cde848f5677c.zip symfony-security-d06bc2e2354a570a2754ef3186c7cde848f5677c.tar.gz symfony-security-d06bc2e2354a570a2754ef3186c7cde848f5677c.tar.bz2 | |
merged branch aboks/acl_voter (PR #1954)
Commits
-------
09c41d3 [Security] Fixed incorrect merge of two modifications (53f5c23c and 85199677) to AclVoter
Discussion
----------
[Security] Fixed incorrect merge of two modifications to AclVoter
It seems two modifications to `AclVoter` (53f5c23c and 85199677) have been merged incorrectly, leading to a method call on an object that is known to be `null` and a fatal error when running the tests
Diffstat (limited to 'Core/Encoder/BasePasswordEncoder.php')
0 files changed, 0 insertions, 0 deletions