diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-07-08 15:37:01 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-07-08 15:37:01 +0200 |
| commit | 7097b710127e22b4d40b5b4cd0ba226755737cf4 (patch) | |
| tree | 3ce17d7909cd354b690343777156e5a310dd81cd | |
| parent | 7ce8f3e89bf87ab6920086fd4c6a620b86fe26b3 (diff) | |
| parent | b33a8d2632bc4ddcc363e2bb9916af9bdd921a1d (diff) | |
| download | symfony-security-7097b710127e22b4d40b5b4cd0ba226755737cf4.zip symfony-security-7097b710127e22b4d40b5b4cd0ba226755737cf4.tar.gz symfony-security-7097b710127e22b4d40b5b4cd0ba226755737cf4.tar.bz2 | |
Merge branch '2.3'
* 2.3:
Update JsonResponse.php
[HttpKernel] fixed the inline renderer when passing objects as attributes (closes #7124)
CookieJar remove unneeded var, Client remove unneeded else
[DI] Fixed bug requesting non existing service from dumped frozen container
Update validators.sk.xlf
[WebProfiler] fix content-type parameter
Replace romaji period characters with Japanese style zenkaku period characters
fixed CS
fixed CS
[Console] Avoided an unnecessary check.
Added missing French validator translations
typo first->second
Passed the config when building the Configuration in ConfigurableExtension
removed unused code
Fixed variable name used in translation cache
Conflicts:
src/Symfony/Component/Console/Event/ConsoleCommandEvent.php
| -rw-r--r-- | Acl/Permission/BasicPermissionMap.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Acl/Permission/BasicPermissionMap.php b/Acl/Permission/BasicPermissionMap.php index e29f360..97157f1 100644 --- a/Acl/Permission/BasicPermissionMap.php +++ b/Acl/Permission/BasicPermissionMap.php @@ -40,46 +40,46 @@ class BasicPermissionMap implements PermissionMapInterface MaskBuilder::MASK_MASTER, MaskBuilder::MASK_OWNER, ), - + self::PERMISSION_EDIT => array( MaskBuilder::MASK_EDIT, MaskBuilder::MASK_OPERATOR, MaskBuilder::MASK_MASTER, MaskBuilder::MASK_OWNER, ), - + self::PERMISSION_CREATE => array( MaskBuilder::MASK_CREATE, MaskBuilder::MASK_OPERATOR, MaskBuilder::MASK_MASTER, MaskBuilder::MASK_OWNER, ), - + self::PERMISSION_DELETE => array( MaskBuilder::MASK_DELETE, MaskBuilder::MASK_OPERATOR, MaskBuilder::MASK_MASTER, MaskBuilder::MASK_OWNER, ), - + self::PERMISSION_UNDELETE => array( MaskBuilder::MASK_UNDELETE, MaskBuilder::MASK_OPERATOR, MaskBuilder::MASK_MASTER, MaskBuilder::MASK_OWNER, ), - + self::PERMISSION_OPERATOR => array( MaskBuilder::MASK_OPERATOR, MaskBuilder::MASK_MASTER, MaskBuilder::MASK_OWNER, ), - + self::PERMISSION_MASTER => array( MaskBuilder::MASK_MASTER, MaskBuilder::MASK_OWNER, ), - + self::PERMISSION_OWNER => array( MaskBuilder::MASK_OWNER, ), |