Skip to content
This repository
Browse code

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

  • Loading branch information...
commit 6f909480e84c013ace980ea16edeb5fb9503faa3 2 parents 5674e9f + b95f367
José Lorenzo Rodríguez authored April 24, 2012
6  lib/Cake/TestSuite/Fixture/CakeTestFixture.php
@@ -241,7 +241,11 @@ public function insert($db) {
241 241
 					$fields = array_keys($record);
242 242
 					$values[] = array_values(array_merge($default, $record));
243 243
 				}
244  
-				return $db->insertMulti($this->table, $fields, $values);
  244
+				$nested = $db->nestedTransaction;
  245
+				$db->nestedTransaction = false;
  246
+				$result = $db->insertMulti($this->table, $fields, $values);
  247
+				$db->nestedTransaction = $nested;
  248
+				return $result;
245 249
 			}
246 250
 			return true;
247 251
 		}

0 notes on commit 6f90948

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