aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp
diff options
context:
space:
mode:
authorRuslan Uzdenov <rxu@mail.ru>2009-07-07 12:55:34 +0000
committerRuslan Uzdenov <rxu@mail.ru>2009-07-07 12:55:34 +0000
commit4991cae3a1f5d3bcb435ae65bd63d4a705aa0653 (patch)
treee596d0caea39589222adec46d2577665f5f572c8 /phpBB/includes/ucp
parent2b2119375243231f5ed735ecb6f664ea96a0b5d5 (diff)
downloadforums-4991cae3a1f5d3bcb435ae65bd63d4a705aa0653.tar
forums-4991cae3a1f5d3bcb435ae65bd63d4a705aa0653.tar.gz
forums-4991cae3a1f5d3bcb435ae65bd63d4a705aa0653.tar.bz2
forums-4991cae3a1f5d3bcb435ae65bd63d4a705aa0653.tar.xz
forums-4991cae3a1f5d3bcb435ae65bd63d4a705aa0653.zip
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
Diffstat (limited to 'phpBB/includes/ucp')
-rw-r--r--phpBB/includes/ucp/ucp_pm_compose.php5
1 files changed, 4 insertions, 1 deletions
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'];