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_posting.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_posting.php')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index b93a89e773..9c6ddffe9f 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -1037,7 +1037,7 @@ function load_drafts($topic_id = 0, $forum_id = 0, $id = 0, $pm_action = '', $ms */ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id = 0, $show_quote_button = true) { - global $user, $auth, $db, $template, $bbcode, $cache; + global $user, $auth, $db, $template, $cache; global $config, $phpbb_root_path, $phpEx, $phpbb_container, $phpbb_dispatcher; /* @var $phpbb_content_visibility \phpbb\content_visibility */ @@ -1096,13 +1096,11 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id $sql = $db->sql_build_query('SELECT', $sql_ary); $result = $db->sql_query($sql); - $bbcode_bitfield = ''; $rowset = array(); $has_attachments = false; while ($row = $db->sql_fetchrow($result)) { $rowset[$row['post_id']] = $row; - $bbcode_bitfield = $bbcode_bitfield | base64_decode($row['bbcode_bitfield']); if ($row['post_attachment']) { @@ -1111,13 +1109,6 @@ function topic_review($topic_id, $forum_id, $mode = 'topic_review', $cur_post_id } $db->sql_freeresult($result); - // Instantiate BBCode class - if (!isset($bbcode) && $bbcode_bitfield !== '') - { - include_once($phpbb_root_path . 'includes/bbcode.' . $phpEx); - $bbcode = new bbcode(base64_encode($bbcode_bitfield)); - } - // Grab extensions $extensions = $attachments = array(); if ($has_attachments && $auth->acl_get('u_download') && $auth->acl_get('f_download', $forum_id)) |