aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_content.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2018-11-17 22:18:08 +0100
committerMarc Alexander <admin@m-a-styles.de>2018-11-17 22:18:08 +0100
commit97912d74e2f2e0e98662a590cc2e34ac929bd725 (patch)
tree3e52e5354d93c164ef8b402f1deeec8c3691e715 /phpBB/includes/functions_content.php
parent7801bac09ac1fb5a10c0c518e1e7639233855220 (diff)
parentda9da88d11f1d62105268def24ae70c0e64bb840 (diff)
downloadforums-97912d74e2f2e0e98662a590cc2e34ac929bd725.tar
forums-97912d74e2f2e0e98662a590cc2e34ac929bd725.tar.gz
forums-97912d74e2f2e0e98662a590cc2e34ac929bd725.tar.bz2
forums-97912d74e2f2e0e98662a590cc2e34ac929bd725.tar.xz
forums-97912d74e2f2e0e98662a590cc2e34ac929bd725.zip
Merge pull request #5448 from rxu/ticket/15875
[ticket/15875] Fix PHP fatal error on BBCode parsing
Diffstat (limited to 'phpBB/includes/functions_content.php')
-rw-r--r--phpBB/includes/functions_content.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
index 43dce036a3..8284aab6a4 100644
--- a/phpBB/includes/functions_content.php
+++ b/phpBB/includes/functions_content.php
@@ -627,7 +627,7 @@ function generate_text_for_display($text, $uid, $bitfield, $flags, $censor_text
}
else
{
- $bbcode->bbcode($bitfield);
+ $bbcode->bbcode_set_bitfield($bitfield);
}
$bbcode->bbcode_second_pass($text, $uid);