From 06c980f1ec61816846557e88832acd9b1c7644e5 Mon Sep 17 00:00:00 2001 From: markshawtoronto Date: Tue, 27 Sep 2016 11:45:23 -0400 Subject: [ticket/14799] purge_notifications() should not leave open transactions. When running purge_notifications(), if a notification type does not exist then a db transaction is started but never completed. On an error in get_notification_type_id(), end the transaction. PHPBB3-14799 --- phpBB/phpbb/notification/manager.php | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/phpbb/notification') 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)); } -- cgit v1.2.1