@@ -1,8 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | return [ |
4 | - Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true], |
|
5 | - Symfony\Bundle\WebServerBundle\WebServerBundle::class => ['dev' => true], |
|
6 | - Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true], |
|
7 | - Aimeos\ShopBundle\AimeosShopBundle::class => ['all' => true], |
|
4 | + Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true], |
|
5 | + Symfony\Bundle\WebServerBundle\WebServerBundle::class => ['dev' => true], |
|
6 | + Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true], |
|
7 | + Aimeos\ShopBundle\AimeosShopBundle::class => ['all' => true], |
|
8 | 8 | ]; |
9 | 9 | \ No newline at end of file |
@@ -96,8 +96,7 @@ discard block |
||
96 | 96 | && in_array( 'ROLE_SUPER_ADMIN', (array) $user->getRoles() ) |
97 | 97 | ) { |
98 | 98 | $helper = new \Aimeos\Base\View\Helper\Access\All( $view ); |
99 | - } |
|
100 | - else |
|
99 | + } else |
|
101 | 100 | { |
102 | 101 | $container = $this->container; |
103 | 102 | |
@@ -139,9 +138,12 @@ discard block |
||
139 | 138 | */ |
140 | 139 | protected function addCsrf( \Aimeos\Base\View\Iface $view ) |
141 | 140 | { |
142 | - try { |
|
141 | + try |
|
142 | + { |
|
143 | 143 | $token = $this->tokenManager->getToken( '_token' )->getValue(); |
144 | - } catch( \Symfony\Component\HttpFoundation\Exception\SessionNotFoundException $e ) { |
|
144 | + } |
|
145 | + catch( \Symfony\Component\HttpFoundation\Exception\SessionNotFoundException $e ) |
|
146 | + { |
|
145 | 147 | $token = ''; |
146 | 148 | } |
147 | 149 | |
@@ -257,8 +259,7 @@ discard block |
||
257 | 259 | { |
258 | 260 | $i18n = $this->container->get( 'aimeos.i18n' )->get( array( $locale ) ); |
259 | 261 | $translation = $i18n[$locale]; |
260 | - } |
|
261 | - else |
|
262 | + } else |
|
262 | 263 | { |
263 | 264 | $translation = new \Aimeos\Base\Translation\None( 'en' ); |
264 | 265 | } |