diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-02-25 05:46:52 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-02-25 05:46:52 +0000 |
| commit | f95e730adf1d77e65cb4c408b49a62e2888b5f64 (patch) | |
| tree | 98903248b26be5dae0c1548c097b5a3139c84db1 /phpBB/includes/ucp | |
| parent | 73a2c56104cdf97f35a0e1a417bbc3ec8e005050 (diff) | |
| download | forums-f95e730adf1d77e65cb4c408b49a62e2888b5f64.tar forums-f95e730adf1d77e65cb4c408b49a62e2888b5f64.tar.gz forums-f95e730adf1d77e65cb4c408b49a62e2888b5f64.tar.bz2 forums-f95e730adf1d77e65cb4c408b49a62e2888b5f64.tar.xz forums-f95e730adf1d77e65cb4c408b49a62e2888b5f64.zip | |
Another one bites the dust :D
- Nicer way of cleaning junk in PM export
- Added various signature and posting controls :P
git-svn-id: file:///svn/phpbb/trunk@5583 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewfolder.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php index 173029f0bd..fff1b5928e 100644 --- a/phpBB/includes/ucp/ucp_pm_viewfolder.php +++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php @@ -138,7 +138,8 @@ function view_folder($id, $mode, $folder_id, $folder, $type) if ($submit_export && ($export_type !== 'CSV' || ($delimiter !== '' && $enclosure !== ''))) { - $sql = 'SELECT p.message_text + include_once($phpbb_root_path . 'includes/functions_posting.'.$phpEx); + $sql = 'SELECT p.message_text, p.bbcode_uid FROM ' . PRIVMSGS_TO_TABLE . ' t, ' . PRIVMSGS_TABLE . ' p, ' . USERS_TABLE . ' u WHERE t.user_id = ' . $user->data['user_id'] . " AND p.author_id = u.user_id @@ -149,9 +150,9 @@ function view_folder($id, $mode, $folder_id, $folder, $type) $message_row = $db->sql_fetchrow($result); $db->sql_freeresult($result); - $message = preg_replace('#\[(\/?[a-z\*\+\-]+(?:=.*?)?)(?:\:?[0-9a-z]{5,})\]#', '[\1]', $message_row['message_text']); + decode_message($message_row['message_text'], $message_row['bbcode_uid']); - $data[] = array('subject' => censor_text($row['message_subject']), 'from' => $row['username'], 'date' => $user->format_date($row['message_time']), 'to' => ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX) ? implode(', ', $address_list[$message_id]) : '', 'message' => $message); + $data[] = array('subject' => censor_text($row['message_subject']), 'from' => $row['username'], 'date' => $user->format_date($row['message_time']), 'to' => ($folder_id == PRIVMSGS_OUTBOX || $folder_id == PRIVMSGS_SENTBOX) ? implode(', ', $address_list[$message_id]) : '', 'message' => $message_row['message_text']); } else if (!$submit_export || $export_type !== 'CSV') { |