@@ -116,8 +116,7 @@ discard block |
||
| 116 | 116 | foreach( $columns as $name ) { |
| 117 | 117 | $names .= '"' . $name . '", '; $values .= '?, '; |
| 118 | 118 | } |
| 119 | - } |
|
| 120 | - else |
|
| 119 | + } else |
|
| 121 | 120 | { |
| 122 | 121 | foreach( $columns as $name ) { |
| 123 | 122 | $names .= '"' . $name . '" = ?, '; |
@@ -276,8 +275,7 @@ discard block |
||
| 276 | 275 | { |
| 277 | 276 | $parts = array_slice( explode( '.', $attrcode ), 0, -1 ); |
| 278 | 277 | $str = 'm' . substr( array_shift( $parts ) ?: $this->getDomain(), 0, 3 ); |
| 279 | - } |
|
| 280 | - else |
|
| 278 | + } else |
|
| 281 | 279 | { |
| 282 | 280 | $parts = explode( '/', $this->getSubPath() ); |
| 283 | 281 | $str = 'm' . substr( $this->getDomain(), 0, 3 ); |
@@ -1050,8 +1048,7 @@ discard block |
||
| 1050 | 1048 | */ |
| 1051 | 1049 | $path = $this->getConfigKey( 'insert', 'mshop/common/manager/insert' ); |
| 1052 | 1050 | $sql = $this->addSqlColumns( array_keys( $columns ), $this->getSqlConfig( $path ) ); |
| 1053 | - } |
|
| 1054 | - else |
|
| 1051 | + } else |
|
| 1055 | 1052 | { |
| 1056 | 1053 | /** mshop/common/manager/update/mysql |
| 1057 | 1054 | * Updates an existing record in the database |
@@ -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 | } |