aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_pm_compose.php
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2012-11-09 20:50:20 -0500
committerOleg Pudeyev <oleg@bsdpower.com>2012-11-09 20:50:20 -0500
commit29fdad396d62398f9544ebcfe5ac19cdaad5b120 (patch)
tree17874fa5144a1173ca6abd08fc65de2bdcb6f586 /phpBB/includes/ucp/ucp_pm_compose.php
parent7987e0e68191c802f018455788c40c3b77b26929 (diff)
parente48f5aa29caa2656b20938141937d81f2ae4dd33 (diff)
downloadforums-29fdad396d62398f9544ebcfe5ac19cdaad5b120.tar
forums-29fdad396d62398f9544ebcfe5ac19cdaad5b120.tar.gz
forums-29fdad396d62398f9544ebcfe5ac19cdaad5b120.tar.bz2
forums-29fdad396d62398f9544ebcfe5ac19cdaad5b120.tar.xz
forums-29fdad396d62398f9544ebcfe5ac19cdaad5b120.zip
Merge PR #1045 branch 'bantu/ticket/10780' into develop
* bantu/ticket/10780: [ticket/10780] Use L_COLON on LDAP page. [ticket/10780] Use L_COLON on search backend ACP pages. [ticket/10780] Use L_COLON for "download all attachments". [ticket/10780] Use colon from language in ucp_pm_compose.php where possible. [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html. [ticket/10780] Replace colon usage in adm template output with {L_COLON} [ticket/10780] Replace colon usage in template output with {L_COLON}
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm_compose.php')
-rw-r--r--phpBB/includes/ucp/ucp_pm_compose.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index 934ff566cc..5577e8dab3 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -838,11 +838,11 @@ function compose_pm($id, $mode, $action, $user_folders = array())
$post_id = request_var('p', 0);
if ($config['allow_post_links'])
{
- $message_link = "[url=" . generate_board_url() . "/viewtopic.$phpEx?p={$post_id}#p{$post_id}]{$user->lang['SUBJECT']}: {$message_subject}[/url]\n\n";
+ $message_link = "[url=" . generate_board_url() . "/viewtopic.$phpEx?p={$post_id}#p{$post_id}]{$user->lang['SUBJECT']}{$user->lang['COLON']} {$message_subject}[/url]\n\n";
}
else
{
- $message_link = $user->lang['SUBJECT'] . ': ' . $message_subject . " (" . generate_board_url() . "/viewtopic.$phpEx?p={$post_id}#p{$post_id})\n\n";
+ $message_link = $user->lang['SUBJECT'] . $user->lang['COLON'] . ' ' . $message_subject . " (" . generate_board_url() . "/viewtopic.$phpEx?p={$post_id}#p{$post_id})\n\n";
}
}
else