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

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/12691] Comment change
  [ticket/12691] Change event to core.delete_pm_before
  [ticket/12691] Add core.delete_pm to funtion delete_pm
This commit is contained in:
Joas Schilling 2014-06-22 22:59:42 +02:00
commit d37eb036aa
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
phpBB/includes/functions_privmsgs.php
View file

@ -988,7 +988,7 @@ function handle_mark_actions($user_id, $mark_action)
*/
function delete_pm($user_id, $msg_ids, $folder_id)
{
global $db, $user, $phpbb_root_path, $phpEx, $phpbb_container;
global $db, $user, $phpbb_root_path, $phpEx, $phpbb_container, $phpbb_dispatcher;
$user_id = (int) $user_id;
$folder_id = (int) $folder_id;
@ -1012,6 +1012,18 @@ function delete_pm($user_id, $msg_ids, $folder_id)
return false;
}
/**
* Get all info for PM(s) before they are deleted
*
* @event core.delete_pm_before
* @var int user_id ID of the user requested the message delete
* @var array msg_ids array of all messages to be deleted
* @var int folder_id ID of the user folder where the messages are stored
* @since 3.1.0-b5
*/
$vars = array('user_id', 'msg_ids', 'folder_id');
extract($phpbb_dispatcher->trigger_event('core.delete_pm_before', compact($vars)));
// Get PM Information for later deleting
$sql = 'SELECT msg_id, pm_unread, pm_new
FROM ' . PRIVMSGS_TO_TABLE . '