Mirrors/Sequenzia
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

nighty

Browse Source
This commit is contained in:
Parziphal 2013-10-18 20:20:29 -05:00
parent 49e2421171
commit 9d747d6d0d
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Rails/ActionController/Exception/DoubleRenderException.php
View File

@ -1,7 +1,7 @@
<?php <?php
namespace Rails\ActionController\Exception; namespace Rails\ActionController\Exception;
class DoubleRenderException extends Rails\Exception\LogicException implements ExceptionInterface class DoubleRenderException extends \Rails\Exception\LogicException implements ExceptionInterface
{ {
protected $title = 'Double Render Error'; protected $title = 'Double Render Error';
} }

9
lib/Rails/ActiveRecord/Connection.php
View File

@ -203,8 +203,13 @@ class Connection
$block = $params; $block = $params;
} }
$this->resource()->beginTransaction(); $this->resource()->beginTransaction();
$block(); try {
$this->resource()->commit(); $block();
$this->resource()->commit();
} catch (\Exception $e) {
$this->resource()->rollBack();
throw $e;
}
} }
public function resource() public function resource()