aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_privmsgs.php
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2012-07-22 16:25:17 -0700
committerNils Adermann <naderman@naderman.de>2012-07-22 16:25:17 -0700
commit147a125f69683f2f87017bf9870c804a9f09c3d3 (patch)
treeee9fd0d72ebdd5f113c7756a661525f92aff77b4 /phpBB/includes/functions_privmsgs.php
parent34d5fa69959803ed853cf0d2a8ed3e1506061622 (diff)
parent577dbf89518521f581117df9575363c3a2e16b5f (diff)
downloadforums-147a125f69683f2f87017bf9870c804a9f09c3d3.tar
forums-147a125f69683f2f87017bf9870c804a9f09c3d3.tar.gz
forums-147a125f69683f2f87017bf9870c804a9f09c3d3.tar.bz2
forums-147a125f69683f2f87017bf9870c804a9f09c3d3.tar.xz
forums-147a125f69683f2f87017bf9870c804a9f09c3d3.zip
Merge pull request #914 from EXreaction/ticket/10990
Ticket/10990
Diffstat (limited to 'phpBB/includes/functions_privmsgs.php')
-rw-r--r--phpBB/includes/functions_privmsgs.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php
index 089cb06641..9e055a319f 100644
--- a/phpBB/includes/functions_privmsgs.php
+++ b/phpBB/includes/functions_privmsgs.php
@@ -2084,7 +2084,7 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode
'SUBJECT' => $subject,
'SENT_DATE' => $user->format_date($row['message_time']),
'MESSAGE' => $message,
- 'FOLDER' => implode(', ', $row['folder']),
+ 'FOLDER' => implode($user->lang['COMMA_SEPARATOR'], $row['folder']),
'DECODED_MESSAGE' => $decoded_message,
'S_CURRENT_MSG' => ($row['msg_id'] == $msg_id),