@@ -101,22 +101,22 @@ |
||
| 101 | 101 | catch( \Aimeos\Client\Html\Exception $e ) |
| 102 | 102 | { |
| 103 | 103 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
| 104 | - $view->massErrorList = array_merge($view->get( 'massErrorList', [] ), $error); |
|
| 104 | + $view->massErrorList = array_merge( $view->get( 'massErrorList', [] ), $error ); |
|
| 105 | 105 | } |
| 106 | 106 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
| 107 | 107 | { |
| 108 | 108 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
| 109 | - $view->massErrorList = array_merge($view->get( 'massErrorList', [] ), $error); |
|
| 109 | + $view->massErrorList = array_merge( $view->get( 'massErrorList', [] ), $error ); |
|
| 110 | 110 | } |
| 111 | 111 | catch( \Aimeos\MShop\Exception $e ) |
| 112 | 112 | { |
| 113 | 113 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
| 114 | - $view->massErrorList = array_merge($view->get( 'massErrorList', [] ), $error); |
|
| 114 | + $view->massErrorList = array_merge( $view->get( 'massErrorList', [] ), $error ); |
|
| 115 | 115 | } |
| 116 | 116 | catch( \Exception $e ) |
| 117 | 117 | { |
| 118 | 118 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
| 119 | - $view->massErrorList = array_merge($view->get( 'massErrorList', [] ), $error); |
|
| 119 | + $view->massErrorList = array_merge( $view->get( 'massErrorList', [] ), $error ); |
|
| 120 | 120 | $this->logException( $e ); |
| 121 | 121 | } |
| 122 | 122 | |
@@ -146,8 +146,7 @@ discard block |
||
| 146 | 146 | |
| 147 | 147 | $html = $view->render( $view->config( $tplconf, $default ) ); |
| 148 | 148 | $this->setBasketCached( $key, $html ); |
| 149 | - } |
|
| 150 | - else |
|
| 149 | + } else |
|
| 151 | 150 | { |
| 152 | 151 | $html = $this->modifyBody( $html, $uid ); |
| 153 | 152 | } |
@@ -216,8 +215,7 @@ discard block |
||
| 216 | 215 | { |
| 217 | 216 | $this->logException( $e ); |
| 218 | 217 | } |
| 219 | - } |
|
| 220 | - else |
|
| 218 | + } else |
|
| 221 | 219 | { |
| 222 | 220 | $html = $this->modifyHeader( $html, $uid ); |
| 223 | 221 | } |