From 4991cae3a1f5d3bcb435ae65bd63d4a705aa0653 Mon Sep 17 00:00:00 2001 From: Ruslan Uzdenov Date: Tue, 7 Jul 2009 12:55:34 +0000 Subject: [PATCH] Fixed Bug #39625 - QUOTE-string not included when replying to pm's Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9725 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/includes/ucp/ucp_pm_compose.php | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 3420d4f31d..630f35bc3c 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -141,6 +141,7 @@
  • [Fix] Check if template file is empty before trying to read from it. (Bug #47345 - Patch by bantu)
  • [Fix] Correct descriptions of the permissions to use BBCode, smilies, images and flash to be more relevant. (Bug #36065 - Patch by rxu)
  • [Fix] Fix style issues in print mode. (Bug #26375 - Patch by leviatan21)
    • +
  • [Fix] Fix minor issue with L_QUOTE language string missing in several PM composing modes. (Bug #39625 - Patch by rxu)
  • [Fix] Color bbcode now supports three-digit hex notation. (Bug #39965 - Patch by m0rpha)
  • [Fix] Search by authorname does not display posts of guests and deleted users (Bug #36565 - Patch by nickvergessen)
  • [Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.
    • diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 85e43dfc8c..edee64bd18 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -84,6 +84,10 @@ function compose_pm($id, $mode, $action) } redirect(append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm')); } + + // Since viewtopic.php language entries are used in several modes, + // we include the language file here + $user->add_lang('viewtopic'); // Output PM_TO box if message composing if ($action != 'edit') @@ -746,7 +750,6 @@ function compose_pm($id, $mode, $action) // Preview if (!sizeof($error) && $preview) { - $user->add_lang('viewtopic'); $preview_message = $message_parser->format_display($enable_bbcode, $enable_urls, $enable_smilies, false); $preview_signature = $user->data['user_sig'];