@@ -158,8 +158,7 @@ |
||
158 | 158 | { |
159 | 159 | $path = 'mshop/customer/manager/address/insert'; |
160 | 160 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
161 | - } |
|
162 | - else |
|
161 | + } else |
|
163 | 162 | { |
164 | 163 | $path = 'mshop/customer/manager/address/update'; |
165 | 164 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ), false ); |
@@ -161,8 +161,7 @@ |
||
161 | 161 | $search->compare( '==', $domain . '.lists.domain', $key ), |
162 | 162 | $search->compare( '==', $domain . '.lists.type', $type ), |
163 | 163 | ] ); |
164 | - } |
|
165 | - else |
|
164 | + } else |
|
166 | 165 | { |
167 | 166 | $type = !strncmp( $type, $domain . '/', $len + 1 ) ? [$type, substr( $type, $len + 1 )] : $type; // remove prefix |
168 | 167 | $list[] = $search->compare( '==', $domain . '.lists.domain', $type ); |
@@ -635,5 +635,5 @@ |
||
635 | 635 | * @see mshop/attribute/manager/newid/ansi |
636 | 636 | * @see mshop/attribute/manager/delete/ansi |
637 | 637 | * @see mshop/attribute/manager/search/ansi |
638 | - */ |
|
638 | + */ |
|
639 | 639 | } |
@@ -367,9 +367,12 @@ |
||
367 | 367 | |
368 | 368 | $results = $this->searchItemsBase( $conn, $filter, $cfgPathSearch, $cfgPathCount, $required, $total, $level, $plugins ); |
369 | 369 | |
370 | - try { |
|
370 | + try |
|
371 | + { |
|
371 | 372 | return $this->fetch( $results, $ref, $this->prefix(), $attrs ); |
372 | - } catch( \Exception $e ) { |
|
373 | + } |
|
374 | + catch( \Exception $e ) |
|
375 | + { |
|
373 | 376 | $results->finish(); throw $e; |
374 | 377 | } |
375 | 378 | } |