diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2016-09-28 20:53:10 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2016-09-28 20:53:10 +0200 |
| commit | 6972d06f5921c9fab8e469139ed5646bb495eb8e (patch) | |
| tree | 60b0cbb3f2571eed55747b9d0baf9d70085101c6 | |
| parent | 51d830a6d332b4e37d90ee4f8455a6b3a47f9591 (diff) | |
| parent | 2fd2fb94cf4577b9a48c9d87cd0c14c852667a9f (diff) | |
| download | forums-6972d06f5921c9fab8e469139ed5646bb495eb8e.tar forums-6972d06f5921c9fab8e469139ed5646bb495eb8e.tar.gz forums-6972d06f5921c9fab8e469139ed5646bb495eb8e.tar.bz2 forums-6972d06f5921c9fab8e469139ed5646bb495eb8e.tar.xz forums-6972d06f5921c9fab8e469139ed5646bb495eb8e.zip | |
Merge branch 'prep-release-3.1.10' into 3.1.x
* prep-release-3.1.10:
[ticket/14799] purge_notifications() should not leave open transactions.
| -rw-r--r-- | phpBB/phpbb/notification/manager.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/phpbb/notification/manager.php b/phpBB/phpbb/notification/manager.php index ecba8938f2..f5663f4b34 100644 --- a/phpBB/phpbb/notification/manager.php +++ b/phpBB/phpbb/notification/manager.php @@ -945,6 +945,7 @@ 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($this->user->lang('NOTIFICATION_TYPE_NOT_EXIST', $notification_type_name)); } |