diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2012-11-13 17:29:48 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2012-11-13 17:29:48 +0100 |
| commit | 8b40b021ddeebe23c748a90351384272c4330ec0 (patch) | |
| tree | 0faf70d7d72975732ea3673007870440969139c3 | |
| parent | a55b65699aea8ef7ee998ed36c8c6a3b125d504c (diff) | |
| parent | 242119cc88c85b45eae1dd2a190ffef20e5e7914 (diff) | |
| download | symfony-security-8b40b021ddeebe23c748a90351384272c4330ec0.zip symfony-security-8b40b021ddeebe23c748a90351384272c4330ec0.tar.gz symfony-security-8b40b021ddeebe23c748a90351384272c4330ec0.tar.bz2 | |
Merge branch '2.1'
* 2.1:
fixed comment. The parent ACL is not accessed in this method.
[HttpFoundation] Make host & methods really case insensitive in the RequestMacther
[Validator] fixed Ukrainian language code (closes #5972)
Fixed case of php function
| -rw-r--r-- | Acl/Domain/PermissionGrantingStrategy.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Acl/Domain/PermissionGrantingStrategy.php b/Acl/Domain/PermissionGrantingStrategy.php index 3b4e99a..09e227c 100644 --- a/Acl/Domain/PermissionGrantingStrategy.php +++ b/Acl/Domain/PermissionGrantingStrategy.php @@ -120,10 +120,8 @@ class PermissionGrantingStrategy implements PermissionGrantingStrategyInterface * permission/identity combination. * * This process is repeated until either a granting ACE is found, or no - * permission/identity combinations are left. In the latter case, we will - * call this method on the parent ACL if it exists, and isEntriesInheriting - * is true. Otherwise, we will either throw an NoAceFoundException, or deny - * access finally. + * permission/identity combinations are left. Finally, we will either throw + * an NoAceFoundException, or deny access. * * @param AclInterface $acl * @param array $aces An array of ACE to check against |