aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2009-11-24 14:27:17 +0000
committerAndreas Fischer <bantu@phpbb.com>2009-11-24 14:27:17 +0000
commita019b157465834b52dac10bf5e2a8a5c4001713c (patch)
treebba6c88a5f7d9cfb06a093a576871e037cdaded1 /phpBB
parentefc1f8139b8515472689d681ee65dfd82d7d9675 (diff)
downloadforums-a019b157465834b52dac10bf5e2a8a5c4001713c.tar
forums-a019b157465834b52dac10bf5e2a8a5c4001713c.tar.gz
forums-a019b157465834b52dac10bf5e2a8a5c4001713c.tar.bz2
forums-a019b157465834b52dac10bf5e2a8a5c4001713c.tar.xz
forums-a019b157465834b52dac10bf5e2a8a5c4001713c.zip
Fix Bug #54375 - Show correct HTML title when reporting private messages.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10284 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/docs/CHANGELOG.html2
-rw-r--r--phpBB/report.php4
2 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 6c37c523b0..e2521de916 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -93,7 +93,7 @@
<li>[Fix] Force full date for board online record date.</li>
<li>[Fix] Correctly reset login keys if passed value is the current user. (Bug #54125)</li>
<li>[Fix] Correctly set last modified headers. (Bug #54245, thanks Paul.J.Murphy )</li>
-
+ <li>[Fix] Show correct HTML title when reporting private messages. (Bug #54375)</li>
<li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li>
</ul>
diff --git a/phpBB/report.php b/phpBB/report.php
index d154acf03b..ca8c7bbd0e 100644
--- a/phpBB/report.php
+++ b/phpBB/report.php
@@ -215,6 +215,8 @@ if ($submit && $reason_id)
// Generate the reasons
display_reasons($reason_id);
+$page_title = ($pm_id) ? $user->lang['REPORT_MESSAGE'] : $user->lang['REPORT_POST'];
+
$template->assign_vars(array(
'S_REPORT_POST' => ($pm_id) ? false : true,
'REPORT_TEXT' => $report_text,
@@ -227,7 +229,7 @@ $template->assign_vars(array(
generate_forum_nav($forum_data);
// Start output of page
-page_header($user->lang['REPORT_POST']);
+page_header($page_title);
$template->set_filenames(array(
'body' => 'report_body.html')