@@ -42,8 +42,7 @@ |
||
| 42 | 42 | { |
| 43 | 43 | $options[$name] = (array) $options[$name]; |
| 44 | 44 | $options[$name][] = substr( $option, $pos + 1 ); |
| 45 | - } |
|
| 46 | - else |
|
| 45 | + } else |
|
| 47 | 46 | { |
| 48 | 47 | $options[$name] = substr( $option, $pos + 1 ); |
| 49 | 48 | } |
@@ -60,8 +60,7 @@ discard block |
||
| 60 | 60 | |
| 61 | 61 | $view = new \Aimeos\MW\View\Standard( $templatePaths, $engines ); |
| 62 | 62 | $this->initTwig( $view, $twig ); |
| 63 | - } |
|
| 64 | - else |
|
| 63 | + } else |
|
| 65 | 64 | { |
| 66 | 65 | $view = new \Aimeos\MW\View\Standard( $templatePaths ); |
| 67 | 66 | } |
@@ -232,8 +231,7 @@ discard block |
||
| 232 | 231 | { |
| 233 | 232 | $i18n = $this->container->get( 'aimeos.i18n' )->get( array( $locale ) ); |
| 234 | 233 | $translation = $i18n[$locale]; |
| 235 | - } |
|
| 236 | - else |
|
| 234 | + } else |
|
| 237 | 235 | { |
| 238 | 236 | $translation = new \Aimeos\MW\Translation\None( 'en' ); |
| 239 | 237 | } |
@@ -71,9 +71,12 @@ |
||
| 71 | 71 | { |
| 72 | 72 | $localeManager = \Aimeos\MShop::create( $context, 'locale' ); |
| 73 | 73 | |
| 74 | - try { |
|
| 74 | + try |
|
| 75 | + { |
|
| 75 | 76 | $localeItem = $localeManager->bootstrap( $site, '', '', false, null, true ); |
| 76 | - } catch( \Aimeos\MShop\Exception $e ) { |
|
| 77 | + } |
|
| 78 | + catch( \Aimeos\MShop\Exception $e ) |
|
| 79 | + { |
|
| 77 | 80 | $localeItem = $localeManager->createItem(); |
| 78 | 81 | } |
| 79 | 82 | |
@@ -45,8 +45,7 @@ |
||
| 45 | 45 | $app = $this->app; |
| 46 | 46 | $settings = $this->settings; |
| 47 | 47 | |
| 48 | - $config = function( $key, $default ) use ( $settings ) |
|
| 49 | - { |
|
| 48 | + $config = function( $key, $default ) use ( $settings ) { |
|
| 50 | 49 | foreach( explode( '/', trim( $key, '/' ) ) as $part ) |
| 51 | 50 | { |
| 52 | 51 | if( isset( $settings[$part] ) ) { |
@@ -7,17 +7,17 @@ discard block |
||
| 7 | 7 | 'uploaddir' => '/', |
| 8 | 8 | |
| 9 | 9 | 'page' => [ |
| 10 | - 'account-index' => [ 'account/profile', 'account/subscription', 'account/history', 'account/favorite', 'account/watch', 'basket/mini', 'catalog/session' ], |
|
| 11 | - 'basket-index' => [ 'basket/bulk', 'basket/standard', 'basket/related' ], |
|
| 12 | - 'catalog-count' => [ 'catalog/count' ], |
|
| 13 | - 'catalog-detail' => [ 'basket/mini', 'catalog/stage', 'catalog/detail', 'catalog/session' ], |
|
| 14 | - 'catalog-list' => [ 'basket/mini', 'catalog/filter', 'catalog/lists' ], |
|
| 15 | - 'catalog-stock' => [ 'catalog/stock' ], |
|
| 16 | - 'catalog-suggest' => [ 'catalog/suggest' ], |
|
| 17 | - 'catalog-tree' => [ 'basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists' ], |
|
| 18 | - 'checkout-confirm' => [ 'checkout/confirm' ], |
|
| 19 | - 'checkout-index' => [ 'checkout/standard' ], |
|
| 20 | - 'checkout-update' => [ 'checkout/update' ], |
|
| 10 | + 'account-index' => ['account/profile', 'account/subscription', 'account/history', 'account/favorite', 'account/watch', 'basket/mini', 'catalog/session'], |
|
| 11 | + 'basket-index' => ['basket/bulk', 'basket/standard', 'basket/related'], |
|
| 12 | + 'catalog-count' => ['catalog/count'], |
|
| 13 | + 'catalog-detail' => ['basket/mini', 'catalog/stage', 'catalog/detail', 'catalog/session'], |
|
| 14 | + 'catalog-list' => ['basket/mini', 'catalog/filter', 'catalog/lists'], |
|
| 15 | + 'catalog-stock' => ['catalog/stock'], |
|
| 16 | + 'catalog-suggest' => ['catalog/suggest'], |
|
| 17 | + 'catalog-tree' => ['basket/mini', 'catalog/filter', 'catalog/stage', 'catalog/lists'], |
|
| 18 | + 'checkout-confirm' => ['checkout/confirm'], |
|
| 19 | + 'checkout-index' => ['checkout/standard'], |
|
| 20 | + 'checkout-update' => ['checkout/update'], |
|
| 21 | 21 | ], |
| 22 | 22 | |
| 23 | 23 | 'resource' => [ |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | 'database' => 'slim', |
| 29 | 29 | 'username' => 'aimeos', |
| 30 | 30 | 'password' => 'aimeos', |
| 31 | - 'stmt' => [ "SET SESSION sort_buffer_size=2097144; SET NAMES 'utf8mb4'; SET SESSION sql_mode='ANSI'; SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED" ], |
|
| 31 | + 'stmt' => ["SET SESSION sort_buffer_size=2097144; SET NAMES 'utf8mb4'; SET SESSION sql_mode='ANSI'; SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED"], |
|
| 32 | 32 | 'opt-persistent' => 0, |
| 33 | 33 | 'limit' => 3, |
| 34 | 34 | 'defaultTableOptions' => [ |