makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'prep-release-3.1.10' into 3.1.x

Browse source 
* 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
commit 6972d06f59
No known key found for this signature in database
GPG key ID: 817043C2E29DB881
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/phpbb/notification/manager.php
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));
} }