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

Fix bug #38395 - Loading draft removes recipients when replying to PM

Browse source 
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9685 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Joas Schilling 2009-06-26 11:38:29 +00:00
parent 8f60b757b8
commit 89ddc4543f
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/docs/CHANGELOG.html
View file

@ -134,6 +134,7 @@
<li>[Fix] Correctly display ACP logs options, without permission to clear logs. (Bug #24155 - Patch by leviatan21)</li> <li>[Fix] Correctly display ACP logs options, without permission to clear logs. (Bug #24155 - Patch by leviatan21)</li>
<li>[Fix] Display topic icons in MCP forum view again (only prosilver).</li> <li>[Fix] Display topic icons in MCP forum view again (only prosilver).</li>
<li>[Fix] Properly display post status messages in topic when post is reported and unapproved (Bug #44455 - Patch by leviatan21)</li> <li>[Fix] Properly display post status messages in topic when post is reported and unapproved (Bug #44455 - Patch by leviatan21)</li>
<li>[Fix] Loading draft removes recipients when replying to PM (Bug #38395 - Patch by nickvergessen)</li>
<li>[Fix] Add poster-name to moderator-log when deleting post/topic (Bug #46225 - Patch by nickvergessen)</li> <li>[Fix] Add poster-name to moderator-log when deleting post/topic (Bug #46225 - Patch by nickvergessen)</li>
<li>[Fix] &quot;Report details&quot; link broken in MCP (Bug #46975 - Patch by nickvergessen)</li> <li>[Fix] &quot;Report details&quot; link broken in MCP (Bug #46975 - Patch by nickvergessen)</li>
<li>[Fix] Resolve accesskey conflicts in prosilver. (Bug #44685 - Patch by bantu)</li> <li>[Fix] Resolve accesskey conflicts in prosilver. (Bug #44685 - Patch by bantu)</li>

4
phpBB/includes/functions_posting.php
View file

@ -818,7 +818,7 @@ function posting_gen_attachment_entry($attachment_data, &$filename_data, $show_a
/** /**
* Load Drafts * 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 $user, $db, $template, $auth;
global $phpbb_root_path, $phpEx; 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... // 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; $link_pm = true;
$insert_url = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=$id&amp;mode=compose&amp;d={$draft['draft_id']}"); $insert_url = append_sid("{$phpbb_root_path}ucp.$phpEx", "i=$id&amp;mode=compose&amp;d={$draft['draft_id']}" . (($pm_action) ? "&amp;action=$pm_action" : '') . (($msg_id) ? "&amp;p=$msg_id" : ''));
} }
$template->assign_block_vars('draftrow', array( $template->assign_block_vars('draftrow', array(

2
phpBB/includes/ucp/ucp_pm_compose.php
View file

@ -631,7 +631,7 @@ function compose_pm($id, $mode, $action)
// Load Drafts // Load Drafts
if ($load && $drafts) if ($load && $drafts)
{ {
load_drafts(0, 0, $id); load_drafts(0, 0, $id, $action, $msg_id);
} }
if ($submit || $preview || $refresh) if ($submit || $preview || $refresh)