diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-06-22 22:59:42 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-06-22 22:59:42 +0200 |
| commit | d37eb036aa3f4e3ea25634cf98dade1dd9018b11 (patch) | |
| tree | b4dd88f35f280712aac77871db89179b76182b4d | |
| parent | a73fda8b42bffc505f35ed87ea78edd0d811c379 (diff) | |
| parent | bb8be29fd53c73104f35f67ec41f8ddc6d561e17 (diff) | |
| download | forums-d37eb036aa3f4e3ea25634cf98dade1dd9018b11.tar forums-d37eb036aa3f4e3ea25634cf98dade1dd9018b11.tar.gz forums-d37eb036aa3f4e3ea25634cf98dade1dd9018b11.tar.bz2 forums-d37eb036aa3f4e3ea25634cf98dade1dd9018b11.tar.xz forums-d37eb036aa3f4e3ea25634cf98dade1dd9018b11.zip | |
Merge branch 'develop-ascraeus' into develop
* 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
| -rw-r--r-- | phpBB/includes/functions_privmsgs.php | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 92655cd035..f9e80d5df1 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -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 . ' |