diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-09-28 20:56:51 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-09-28 20:56:51 +0200 |
| commit | 737ef92a1e1c702b29d4f6be82c367aed487231c (patch) | |
| tree | f1b27ab351119cf1917f1c680b0f6d44da9661f3 /phpBB/phpbb/notification | |
| parent | ef755ffd38e077d448321177dcc4ec8c49b5e122 (diff) | |
| parent | 6972d06f5921c9fab8e469139ed5646bb495eb8e (diff) | |
| download | forums-737ef92a1e1c702b29d4f6be82c367aed487231c.tar forums-737ef92a1e1c702b29d4f6be82c367aed487231c.tar.gz forums-737ef92a1e1c702b29d4f6be82c367aed487231c.tar.bz2 forums-737ef92a1e1c702b29d4f6be82c367aed487231c.tar.xz forums-737ef92a1e1c702b29d4f6be82c367aed487231c.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14799] purge_notifications() should not leave open transactions.
Diffstat (limited to 'phpBB/phpbb/notification')
| -rw-r--r-- | phpBB/phpbb/notification/manager.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/phpbb/notification/manager.php b/phpBB/phpbb/notification/manager.php index 023e1610f0..8ec5ec4b32 100644 --- a/phpBB/phpbb/notification/manager.php +++ b/phpBB/phpbb/notification/manager.php @@ -921,6 +921,8 @@ class manager { if (!isset($this->notification_types[$notification_type_name]) && !isset($this->notification_types['notification.type.' . $notification_type_name])) { + $this->db->sql_transaction('rollback'); + throw new \phpbb\notification\exception('NOTIFICATION_TYPE_NOT_EXIST', array($notification_type_name)); } |