Merge branch '3.2.x'

* 3.2.x:
  [ticket/14799] purge_notifications() should not leave open transactions.
This commit is contained in:
Tristan Darricau 2016-09-28 20:58:39 +02:00
commit ab84605991
No known key found for this signature in database
GPG key ID: 817043C2E29DB881

View file

@ -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));
}