makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-19 01:38:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/12435] Update the comment
  [ticket/12435] purge_notifications() fails for unused notifications
This commit is contained in:
Andreas Fischer 2014-05-14 23:12:11 +02:00
commit d867e52a2e
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
phpBB/phpbb/notification/manager.php
View file

@ -760,17 +760,30 @@ class manager
*/ */
public function purge_notifications($notification_type_name) public function purge_notifications($notification_type_name)
{ {
$notification_type_id = $this->get_notification_type_id($notification_type_name); // If a notification is never used, its type will not be added to the database
// nor its id cached. If this method is called by an extension during the
// purge step, and that extension never used its notifications,
// get_notification_type_id() will throw an exception. However,
// because no notification type was added to the database,
// there is nothing to delete, so we can silently drop the exception.
try
{
$notification_type_id = $this->get_notification_type_id($notification_type_name);
$sql = 'DELETE FROM ' . $this->notifications_table . ' $sql = 'DELETE FROM ' . $this->notifications_table . '
WHERE notification_type_id = ' . (int) $notification_type_id; WHERE notification_type_id = ' . (int) $notification_type_id;
$this->db->sql_query($sql); $this->db->sql_query($sql);
$sql = 'DELETE FROM ' . $this->notification_types_table . ' $sql = 'DELETE FROM ' . $this->notification_types_table . '
WHERE notification_type_id = ' . (int) $notification_type_id; WHERE notification_type_id = ' . (int) $notification_type_id;
$this->db->sql_query($sql); $this->db->sql_query($sql);
$this->cache->destroy('notification_type_ids'); $this->cache->destroy('notification_type_ids');
}
catch (\phpbb\notification\exception $e)
{
// Continue
}
} }
/** /**