diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-07-22 16:25:17 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-07-22 16:25:17 -0700 |
| commit | 147a125f69683f2f87017bf9870c804a9f09c3d3 (patch) | |
| tree | ee9fd0d72ebdd5f113c7756a661525f92aff77b4 /phpBB/includes/ucp/ucp_pm_viewfolder.php | |
| parent | 34d5fa69959803ed853cf0d2a8ed3e1506061622 (diff) | |
| parent | 577dbf89518521f581117df9575363c3a2e16b5f (diff) | |
| download | forums-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/ucp/ucp_pm_viewfolder.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewfolder.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php index dc77587452..1026f24699 100644 --- a/phpBB/includes/ucp/ucp_pm_viewfolder.php +++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php @@ -176,7 +176,7 @@ function view_folder($id, $mode, $folder_id, $folder) 'U_VIEW_PM' => ($row['pm_deleted']) ? '' : $view_message_url, 'U_REMOVE_PM' => ($row['pm_deleted']) ? $remove_message_url : '', 'U_MCP_REPORT' => (isset($row['report_id'])) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=pm_reports&mode=pm_report_details&r=' . $row['report_id']) : '', - 'RECIPIENTS' => ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX) ? implode(', ', $address_list[$message_id]) : '') + 'RECIPIENTS' => ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX) ? implode($user->lang['COMMA_SEPARATOR'], $address_list[$message_id]) : '') ); } unset($folder_info['rowset']); @@ -266,9 +266,9 @@ function view_folder($id, $mode, $folder_id, $folder) } } - // There is the chance that all recipients of the message got deleted. To avoid creating + // There is the chance that all recipients of the message got deleted. To avoid creating // exports without recipients, we add a bogus "undisclosed recipient". - if (!(isset($address[$message_id]['g']) && sizeof($address[$message_id]['g'])) && + if (!(isset($address[$message_id]['g']) && sizeof($address[$message_id]['g'])) && !(isset($address[$message_id]['u']) && sizeof($address[$message_id]['u']))) { $address[$message_id]['u'] = array(); @@ -277,7 +277,7 @@ function view_folder($id, $mode, $folder_id, $folder) } decode_message($message_row['message_text'], $message_row['bbcode_uid']); - + $data[] = array( 'subject' => censor_text($row['message_subject']), 'sender' => $row['username'], |