diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2009-06-26 11:38:29 +0000 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2009-06-26 11:38:29 +0000 |
| commit | 89ddc4543f987f4edda07e7a09552a2e93dc238a (patch) | |
| tree | fbba716a48e8b08427e4b768cd13ad4b0891a7d4 /phpBB/includes/functions_posting.php | |
| parent | 8f60b757b85579407bd1ef07a59b85b1a791e43c (diff) | |
| download | forums-89ddc4543f987f4edda07e7a09552a2e93dc238a.tar forums-89ddc4543f987f4edda07e7a09552a2e93dc238a.tar.gz forums-89ddc4543f987f4edda07e7a09552a2e93dc238a.tar.bz2 forums-89ddc4543f987f4edda07e7a09552a2e93dc238a.tar.xz forums-89ddc4543f987f4edda07e7a09552a2e93dc238a.zip | |
Fix bug #38395 - Loading draft removes recipients when replying to PM
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9685 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_posting.php')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index e0dc128583..18bb432769 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -818,7 +818,7 @@ function posting_gen_attachment_entry($attachment_data, &$filename_data, $show_a /** * Load Drafts */ -function load_drafts($topic_id = 0, $forum_id = 0, $id = 0) +function load_drafts($topic_id = 0, $forum_id = 0, $id = 0, $pm_action = '', $msg_id = 0) { global $user, $db, $template, $auth; global $phpbb_root_path, $phpEx; @@ -911,7 +911,7 @@ function load_drafts($topic_id = 0, $forum_id = 0, $id = 0) { // Either display as PM draft if forum_id and topic_id are empty or if access to the forums has been denied afterwards... $link_pm = true; - $insert_url = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=$id&mode=compose&d={$draft['draft_id']}"); + $insert_url = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=$id&mode=compose&d={$draft['draft_id']}" . (($pm_action) ? "&action=$pm_action" : '') . (($msg_id) ? "&p=$msg_id" : '')); } $template->assign_block_vars('draftrow', array( |