@@ -204,7 +204,7 @@ |
||
204 | 204 | { |
205 | 205 | if( is_array( $item->getDefault() ) ) |
206 | 206 | { |
207 | - foreach( (array) $item->getDefault() as $key2 => $value ){ |
|
207 | + foreach( (array) $item->getDefault() as $key2 => $value ) { |
|
208 | 208 | $urlParams[] = $namefcn( $this, array( $item->getInternalCode(), $key2 ) ) . '=' . urlencode( $value ); |
209 | 209 | } |
210 | 210 | } |
@@ -248,7 +248,7 @@ |
||
248 | 248 | catch( \Aimeos\Controller\Frontend\Basket\Exception $e ) |
249 | 249 | { |
250 | 250 | $view->deliveryError = $e->getErrors(); |
251 | - $view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $e->getErrors()); |
|
251 | + $view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $e->getErrors() ); |
|
252 | 252 | |
253 | 253 | throw $e; |
254 | 254 | } |
@@ -256,7 +256,7 @@ |
||
256 | 256 | |
257 | 257 | $view->summaryErrorCodes = $errors; |
258 | 258 | $view->standardStepActive = 'summary'; |
259 | - $view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), array( $error )); |
|
259 | + $view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), array( $error ) ); |
|
260 | 260 | } |
261 | 261 | |
262 | 262 |
@@ -303,22 +303,22 @@ |
||
303 | 303 | catch( \Aimeos\Client\Html\Exception $e ) |
304 | 304 | { |
305 | 305 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
306 | - $view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error); |
|
306 | + $view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error ); |
|
307 | 307 | } |
308 | 308 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
309 | 309 | { |
310 | 310 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
311 | - $view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error); |
|
311 | + $view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error ); |
|
312 | 312 | } |
313 | 313 | catch( \Aimeos\MShop\Exception $e ) |
314 | 314 | { |
315 | 315 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
316 | - $view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error); |
|
316 | + $view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error ); |
|
317 | 317 | } |
318 | 318 | catch( \Exception $e ) |
319 | 319 | { |
320 | 320 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
321 | - $view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error); |
|
321 | + $view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error ); |
|
322 | 322 | $this->logException( $e ); |
323 | 323 | } |
324 | 324 | } |
@@ -141,22 +141,22 @@ discard block |
||
141 | 141 | catch( \Aimeos\Client\Html\Exception $e ) |
142 | 142 | { |
143 | 143 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
144 | - $view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error); |
|
144 | + $view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error ); |
|
145 | 145 | } |
146 | 146 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
147 | 147 | { |
148 | 148 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
149 | - $view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error); |
|
149 | + $view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error ); |
|
150 | 150 | } |
151 | 151 | catch( \Aimeos\MShop\Exception $e ) |
152 | 152 | { |
153 | 153 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
154 | - $view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error); |
|
154 | + $view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error ); |
|
155 | 155 | } |
156 | 156 | catch( \Exception $e ) |
157 | 157 | { |
158 | 158 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
159 | - $view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error); |
|
159 | + $view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error ); |
|
160 | 160 | $this->logException( $e ); |
161 | 161 | } |
162 | 162 | |
@@ -346,12 +346,12 @@ discard block |
||
346 | 346 | catch( \Aimeos\Client\Html\Exception $e ) |
347 | 347 | { |
348 | 348 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
349 | - $view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error); |
|
349 | + $view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error ); |
|
350 | 350 | } |
351 | 351 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
352 | 352 | { |
353 | 353 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
354 | - $view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error); |
|
354 | + $view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error ); |
|
355 | 355 | } |
356 | 356 | catch( \Aimeos\MShop\Plugin\Provider\Exception $e ) |
357 | 357 | { |
@@ -359,17 +359,17 @@ discard block |
||
359 | 359 | $errors = array_merge( $errors, $this->translatePluginErrorCodes( $e->getErrorCodes() ) ); |
360 | 360 | |
361 | 361 | $view->summaryErrorCodes = $e->getErrorCodes(); |
362 | - $view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $errors); |
|
362 | + $view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $errors ); |
|
363 | 363 | } |
364 | 364 | catch( \Aimeos\MShop\Exception $e ) |
365 | 365 | { |
366 | 366 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
367 | - $view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error); |
|
367 | + $view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error ); |
|
368 | 368 | } |
369 | 369 | catch( \Exception $e ) |
370 | 370 | { |
371 | 371 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
372 | - $view->standardErrorList = array_merge($view->get( 'standardErrorList', [] ), $error); |
|
372 | + $view->standardErrorList = array_merge( $view->get( 'standardErrorList', [] ), $error ); |
|
373 | 373 | $this->logException( $e ); |
374 | 374 | } |
375 | 375 | } |
@@ -108,22 +108,22 @@ discard block |
||
108 | 108 | catch( \Aimeos\Client\Html\Exception $e ) |
109 | 109 | { |
110 | 110 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
111 | - $view->confirmErrorList = array_merge($view->get( 'confirmErrorList', [] ), $error); |
|
111 | + $view->confirmErrorList = array_merge( $view->get( 'confirmErrorList', [] ), $error ); |
|
112 | 112 | } |
113 | 113 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
114 | 114 | { |
115 | 115 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
116 | - $view->confirmErrorList = array_merge($view->get( 'confirmErrorList', [] ), $error); |
|
116 | + $view->confirmErrorList = array_merge( $view->get( 'confirmErrorList', [] ), $error ); |
|
117 | 117 | } |
118 | 118 | catch( \Aimeos\MShop\Exception $e ) |
119 | 119 | { |
120 | 120 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
121 | - $view->confirmErrorList = array_merge($view->get( 'confirmErrorList', [] ), $error); |
|
121 | + $view->confirmErrorList = array_merge( $view->get( 'confirmErrorList', [] ), $error ); |
|
122 | 122 | } |
123 | 123 | catch( \Exception $e ) |
124 | 124 | { |
125 | 125 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
126 | - $view->confirmErrorList = array_merge($view->get( 'confirmErrorList', [] ), $error); |
|
126 | + $view->confirmErrorList = array_merge( $view->get( 'confirmErrorList', [] ), $error ); |
|
127 | 127 | $this->logException( $e ); |
128 | 128 | } |
129 | 129 | |
@@ -343,22 +343,22 @@ discard block |
||
343 | 343 | catch( \Aimeos\Client\Html\Exception $e ) |
344 | 344 | { |
345 | 345 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
346 | - $view->confirmErrorList = array_merge($view->get( 'confirmErrorList', [] ), $error); |
|
346 | + $view->confirmErrorList = array_merge( $view->get( 'confirmErrorList', [] ), $error ); |
|
347 | 347 | } |
348 | 348 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
349 | 349 | { |
350 | 350 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
351 | - $view->confirmErrorList = array_merge($view->get( 'confirmErrorList', [] ), $error); |
|
351 | + $view->confirmErrorList = array_merge( $view->get( 'confirmErrorList', [] ), $error ); |
|
352 | 352 | } |
353 | 353 | catch( \Aimeos\MShop\Exception $e ) |
354 | 354 | { |
355 | 355 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
356 | - $view->confirmErrorList = array_merge($view->get( 'confirmErrorList', [] ), $error); |
|
356 | + $view->confirmErrorList = array_merge( $view->get( 'confirmErrorList', [] ), $error ); |
|
357 | 357 | } |
358 | 358 | catch( \Exception $e ) |
359 | 359 | { |
360 | 360 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
361 | - $view->confirmErrorList = array_merge($view->get( 'confirmErrorList', [] ), $error); |
|
361 | + $view->confirmErrorList = array_merge( $view->get( 'confirmErrorList', [] ), $error ); |
|
362 | 362 | $this->logException( $e ); |
363 | 363 | } |
364 | 364 | } |
@@ -86,22 +86,22 @@ |
||
86 | 86 | catch( \Aimeos\Client\Html\Exception $e ) |
87 | 87 | { |
88 | 88 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
89 | - $view->updateErrorList = array_merge($view->get( 'updateErrorList', [] ), $error); |
|
89 | + $view->updateErrorList = array_merge( $view->get( 'updateErrorList', [] ), $error ); |
|
90 | 90 | } |
91 | 91 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
92 | 92 | { |
93 | 93 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
94 | - $view->updateErrorList = array_merge($view->get( 'updateErrorList', [] ), $error); |
|
94 | + $view->updateErrorList = array_merge( $view->get( 'updateErrorList', [] ), $error ); |
|
95 | 95 | } |
96 | 96 | catch( \Aimeos\MShop\Exception $e ) |
97 | 97 | { |
98 | 98 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
99 | - $view->updateErrorList = array_merge($view->get( 'updateErrorList', [] ), $error); |
|
99 | + $view->updateErrorList = array_merge( $view->get( 'updateErrorList', [] ), $error ); |
|
100 | 100 | } |
101 | 101 | catch( \Exception $e ) |
102 | 102 | { |
103 | 103 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
104 | - $view->updateErrorList = array_merge($view->get( 'updateErrorList', [] ), $error); |
|
104 | + $view->updateErrorList = array_merge( $view->get( 'updateErrorList', [] ), $error ); |
|
105 | 105 | $this->logException( $e ); |
106 | 106 | } |
107 | 107 |
@@ -107,22 +107,22 @@ discard block |
||
107 | 107 | catch( \Aimeos\Client\Html\Exception $e ) |
108 | 108 | { |
109 | 109 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
110 | - $view->subscriptionErrorList = array_merge($view->get( 'subscriptionErrorList', [] ), $error); |
|
110 | + $view->subscriptionErrorList = array_merge( $view->get( 'subscriptionErrorList', [] ), $error ); |
|
111 | 111 | } |
112 | 112 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
113 | 113 | { |
114 | 114 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
115 | - $view->subscriptionErrorList = array_merge($view->get( 'subscriptionErrorList', [] ), $error); |
|
115 | + $view->subscriptionErrorList = array_merge( $view->get( 'subscriptionErrorList', [] ), $error ); |
|
116 | 116 | } |
117 | 117 | catch( \Aimeos\MShop\Exception $e ) |
118 | 118 | { |
119 | 119 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
120 | - $view->subscriptionErrorList = array_merge($view->get( 'subscriptionErrorList', [] ), $error); |
|
120 | + $view->subscriptionErrorList = array_merge( $view->get( 'subscriptionErrorList', [] ), $error ); |
|
121 | 121 | } |
122 | 122 | catch( \Exception $e ) |
123 | 123 | { |
124 | 124 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
125 | - $view->subscriptionErrorList = array_merge($view->get( 'subscriptionErrorList', [] ), $error); |
|
125 | + $view->subscriptionErrorList = array_merge( $view->get( 'subscriptionErrorList', [] ), $error ); |
|
126 | 126 | $this->logException( $e ); |
127 | 127 | } |
128 | 128 | |
@@ -312,22 +312,22 @@ discard block |
||
312 | 312 | catch( \Aimeos\MShop\Exception $e ) |
313 | 313 | { |
314 | 314 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
315 | - $view->subscriptionErrorList = array_merge($view->get( 'subscriptionErrorList', [] ), $error); |
|
315 | + $view->subscriptionErrorList = array_merge( $view->get( 'subscriptionErrorList', [] ), $error ); |
|
316 | 316 | } |
317 | 317 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
318 | 318 | { |
319 | 319 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
320 | - $view->subscriptionErrorList = array_merge($view->get( 'subscriptionErrorList', [] ), $error); |
|
320 | + $view->subscriptionErrorList = array_merge( $view->get( 'subscriptionErrorList', [] ), $error ); |
|
321 | 321 | } |
322 | 322 | catch( \Aimeos\Client\Html\Exception $e ) |
323 | 323 | { |
324 | 324 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
325 | - $view->subscriptionErrorList = array_merge($view->get( 'subscriptionErrorList', [] ), $error); |
|
325 | + $view->subscriptionErrorList = array_merge( $view->get( 'subscriptionErrorList', [] ), $error ); |
|
326 | 326 | } |
327 | 327 | catch( \Exception $e ) |
328 | 328 | { |
329 | 329 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
330 | - $view->subscriptionErrorList = array_merge($view->get( 'subscriptionErrorList', [] ), $error); |
|
330 | + $view->subscriptionErrorList = array_merge( $view->get( 'subscriptionErrorList', [] ), $error ); |
|
331 | 331 | $this->logException( $e ); |
332 | 332 | } |
333 | 333 | } |
@@ -86,22 +86,22 @@ discard block |
||
86 | 86 | catch( \Aimeos\Client\Html\Exception $e ) |
87 | 87 | { |
88 | 88 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
89 | - $view->favoriteErrorList = array_merge($view->get( 'favoriteErrorList', [] ), $error); |
|
89 | + $view->favoriteErrorList = array_merge( $view->get( 'favoriteErrorList', [] ), $error ); |
|
90 | 90 | } |
91 | 91 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
92 | 92 | { |
93 | 93 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
94 | - $view->favoriteErrorList = array_merge($view->get( 'favoriteErrorList', [] ), $error); |
|
94 | + $view->favoriteErrorList = array_merge( $view->get( 'favoriteErrorList', [] ), $error ); |
|
95 | 95 | } |
96 | 96 | catch( \Aimeos\MShop\Exception $e ) |
97 | 97 | { |
98 | 98 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
99 | - $view->favoriteErrorList = array_merge($view->get( 'favoriteErrorList', [] ), $error); |
|
99 | + $view->favoriteErrorList = array_merge( $view->get( 'favoriteErrorList', [] ), $error ); |
|
100 | 100 | } |
101 | 101 | catch( \Exception $e ) |
102 | 102 | { |
103 | 103 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
104 | - $view->favoriteErrorList = array_merge($view->get( 'favoriteErrorList', [] ), $error); |
|
104 | + $view->favoriteErrorList = array_merge( $view->get( 'favoriteErrorList', [] ), $error ); |
|
105 | 105 | $this->logException( $e ); |
106 | 106 | } |
107 | 107 | |
@@ -302,22 +302,22 @@ discard block |
||
302 | 302 | catch( \Aimeos\MShop\Exception $e ) |
303 | 303 | { |
304 | 304 | $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
305 | - $view->favoriteErrorList = array_merge($view->get( 'favoriteErrorList', [] ), $error); |
|
305 | + $view->favoriteErrorList = array_merge( $view->get( 'favoriteErrorList', [] ), $error ); |
|
306 | 306 | } |
307 | 307 | catch( \Aimeos\Controller\Frontend\Exception $e ) |
308 | 308 | { |
309 | 309 | $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
310 | - $view->favoriteErrorList = array_merge($view->get( 'favoriteErrorList', [] ), $error); |
|
310 | + $view->favoriteErrorList = array_merge( $view->get( 'favoriteErrorList', [] ), $error ); |
|
311 | 311 | } |
312 | 312 | catch( \Aimeos\Client\Html\Exception $e ) |
313 | 313 | { |
314 | 314 | $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
315 | - $view->favoriteErrorList = array_merge($view->get( 'favoriteErrorList', [] ), $error); |
|
315 | + $view->favoriteErrorList = array_merge( $view->get( 'favoriteErrorList', [] ), $error ); |
|
316 | 316 | } |
317 | 317 | catch( \Exception $e ) |
318 | 318 | { |
319 | 319 | $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
320 | - $view->favoriteErrorList = array_merge($view->get( 'favoriteErrorList', [] ), $error); |
|
320 | + $view->favoriteErrorList = array_merge( $view->get( 'favoriteErrorList', [] ), $error ); |
|
321 | 321 | $this->logException( $e ); |
322 | 322 | } |
323 | 323 | } |