mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-09 08:17:12 +02:00
Code Issues Releases Wiki Activity

Fix issue processwire/processwire-issues#681 where Fieldtype exceptions getting caught when saving page, which could interfere with InnoDB transactions when Fieldtype throws an Exception

Browse Source
This commit is contained in:
Ryan Cramer
2018-09-13 08:29:49 -04:00
parent dfc0c4da52
commit 844946b706
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wire/core/PagesEditor.php
View File

@@ -282,6 +282,7 @@ class PagesEditor extends Wire {
* - Populates any default values for fields. * - Populates any default values for fields.
* *
* @param Page $page * @param Page $page
* @throws \Exception|WireException|\PDOException if failure occurs while in DB transaction
* *
*/ */
public function setupNew(Page $page) { public function setupNew(Page $page) {
@@ -327,6 +328,7 @@ class PagesEditor extends Wire {
} }
} catch(\Exception $e) { } catch(\Exception $e) {
$this->trackException($e, false, true); $this->trackException($e, false, true);
if($this->wire('database')->inTransaction()) throw $e;
} }
} }
} }
@@ -598,6 +600,7 @@ class PagesEditor extends Wire {
* @param bool $isNew * @param bool $isNew
* @param array $options * @param array $options
* @return bool * @return bool
* @throws \Exception|WireException|\PDOException If any field-saving failure occurs while in a DB transaction
* *
*/ */
protected function savePageFinish(Page $page, $isNew, array $options) { protected function savePageFinish(Page $page, $isNew, array $options) {
@@ -647,6 +650,7 @@ class PagesEditor extends Wire {
} catch(\Exception $e) { } catch(\Exception $e) {
$error = sprintf($this->_('Error saving field "%s"'), $name) . ' - ' . $e->getMessage(); $error = sprintf($this->_('Error saving field "%s"'), $name) . ' - ' . $e->getMessage();
$this->trackException($e, true, $error); $this->trackException($e, true, $error);
if($this->wire('database')->inTransaction()) throw $e;
} }
} }
} }