@@ -58,8 +58,7 @@ |
||
58 | 58 | |
59 | 59 | $i18n = $this->container->get('aimeos_i18n')->get( array( $locale ) ); |
60 | 60 | $translation = $i18n[$locale]; |
61 | - } |
|
62 | - else |
|
61 | + } else |
|
63 | 62 | { |
64 | 63 | $translation = new \Aimeos\MW\Translation\None( 'en' ); |
65 | 64 | } |
@@ -107,8 +107,7 @@ |
||
107 | 107 | |
108 | 108 | if( $this->container->has( 'security.token_storage' ) ) { |
109 | 109 | $token = $this->container->get( 'security.token_storage' )->getToken(); |
110 | - } |
|
111 | - else if( $this->container->has( 'security.context' ) ) { |
|
110 | + } else if( $this->container->has( 'security.context' ) ) { |
|
112 | 111 | $token = $this->container->get( 'security.context' )->getToken(); |
113 | 112 | } |
114 | 113 |
@@ -210,8 +210,7 @@ |
||
210 | 210 | $localeItem = $localeManager->bootstrap( $sitecode, '', '', false ); |
211 | 211 | $localeItem->setLanguageId( null ); |
212 | 212 | $localeItem->setCurrencyId( null ); |
213 | - } |
|
214 | - catch( \Aimeos\MShop\Locale\Exception $e ) |
|
213 | + } catch( \Aimeos\MShop\Locale\Exception $e ) |
|
215 | 214 | { |
216 | 215 | $localeItem = $localeManager->createItem(); |
217 | 216 | } |
@@ -210,8 +210,7 @@ |
||
210 | 210 | $localeItem = $localeManager->bootstrap( $sitecode, '', '', false ); |
211 | 211 | $localeItem->setLanguageId( null ); |
212 | 212 | $localeItem->setCurrencyId( null ); |
213 | - } |
|
214 | - catch( \Aimeos\MShop\Locale\Exception $e ) |
|
213 | + } catch( \Aimeos\MShop\Locale\Exception $e ) |
|
215 | 214 | { |
216 | 215 | $localeItem = $localeManager->createItem(); |
217 | 216 | } |