diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2012-11-13 17:28:15 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2012-11-13 17:29:06 +0100 |
| commit | 242119cc88c85b45eae1dd2a190ffef20e5e7914 (patch) | |
| tree | 32e4a8c129fa8a472f45a0254af42fd0a9b3ed76 | |
| parent | 40aa7214a62d9ccf45ea2c92a3f0489b87f4c627 (diff) | |
| parent | 1c0e9255855cec9605df0f21ee4f7906b2b00276 (diff) | |
| download | symfony-security-242119cc88c85b45eae1dd2a190ffef20e5e7914.zip symfony-security-242119cc88c85b45eae1dd2a190ffef20e5e7914.tar.gz symfony-security-242119cc88c85b45eae1dd2a190ffef20e5e7914.tar.bz2 | |
Merge branch '2.0' into 2.1
* 2.0:
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
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Resources/translations/validators.uk.xliff
src/Symfony/Component/HttpFoundation/RequestMatcher.php
| -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 |