diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-02-18 18:04:46 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-02-18 18:04:46 +0100 |
| commit | 5ad4685f001a1e9f037091bc84727e8af0a0264b (patch) | |
| tree | 9ec2714668c2f62ef93b96bcb2d52ee893ac17a9 /phpBB/includes/functions_privmsgs.php | |
| parent | 21c6223eb37e17296a109137a519bf3d1d984981 (diff) | |
| parent | 098854a822846ba3aa222acb95d4028aa5cc830c (diff) | |
| download | forums-5ad4685f001a1e9f037091bc84727e8af0a0264b.tar forums-5ad4685f001a1e9f037091bc84727e8af0a0264b.tar.gz forums-5ad4685f001a1e9f037091bc84727e8af0a0264b.tar.bz2 forums-5ad4685f001a1e9f037091bc84727e8af0a0264b.tar.xz forums-5ad4685f001a1e9f037091bc84727e8af0a0264b.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/includes/functions_privmsgs.php')
| -rw-r--r-- | phpBB/includes/functions_privmsgs.php | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 3340995a62..c8b5280c8c 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -1961,7 +1961,7 @@ function submit_pm($mode, $subject, &$data, $put_in_outbox = true) */ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode = false) { - global $db, $user, $config, $template, $phpbb_root_path, $phpEx, $auth, $bbcode; + global $db, $user, $config, $template, $phpbb_root_path, $phpEx, $auth; // Select all receipts and the author from the pm we currently view, to only display their pm-history $sql = 'SELECT author_id, user_id @@ -2013,7 +2013,6 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode $title = $row['message_subject']; $rowset = array(); - $bbcode_bitfield = ''; $folder_url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm') . '&folder='; do @@ -2029,7 +2028,6 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode else { $rowset[$row['msg_id']] = $row; - $bbcode_bitfield = $bbcode_bitfield | base64_decode($row['bbcode_bitfield']); } } while ($row = $db->sql_fetchrow($result)); @@ -2040,16 +2038,6 @@ function message_history($msg_id, $user_id, $message_row, $folder, $in_post_mode return false; } - // Instantiate BBCode class - if ((empty($bbcode) || $bbcode === false) && $bbcode_bitfield !== '') - { - if (!class_exists('bbcode')) - { - include($phpbb_root_path . 'includes/bbcode.' . $phpEx); - } - $bbcode = new bbcode(base64_encode($bbcode_bitfield)); - } - $title = censor_text($title); $url = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm'); |