Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote-tracking branch 'origin/2.2' into 2.2

  • Loading branch information...
commit 6f909480e84c013ace980ea16edeb5fb9503faa3 2 parents 5674e9f + b95f367
@lorenzo lorenzo authored
Showing with 5 additions and 1 deletion.
  1. +5 −1 lib/Cake/TestSuite/Fixture/CakeTestFixture.php
View
6 lib/Cake/TestSuite/Fixture/CakeTestFixture.php
@@ -241,7 +241,11 @@ public function insert($db) {
$fields = array_keys($record);
$values[] = array_values(array_merge($default, $record));
}
- return $db->insertMulti($this->table, $fields, $values);
+ $nested = $db->nestedTransaction;
+ $db->nestedTransaction = false;
+ $result = $db->insertMulti($this->table, $fields, $values);
+ $db->nestedTransaction = $nested;
+ return $result;
}
return true;
}

0 comments on commit 6f90948

Please sign in to comment.
Something went wrong with that request. Please try again.