1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 22:40:39 +02:00

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.
This commit is contained in:
Tristan Darricau
2016-09-28 20:53:10 +02:00

View File

@@ -945,6 +945,7 @@ class manager
{ {
if (!isset($this->notification_types[$notification_type_name]) && !isset($this->notification_types['notification.type.' . $notification_type_name])) 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)); throw new \phpbb\notification\exception($this->user->lang('NOTIFICATION_TYPE_NOT_EXIST', $notification_type_name));
} }