diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-06 16:23:33 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-06 16:23:33 -0500 |
| commit | 196ed8ef9f063eb4293e740725d1f1c31276fed9 (patch) | |
| tree | 5a541e3db2f5419151706f051fb9428a77bb9bd4 /phpBB/includes/functions_content.php | |
| parent | 1d388d98ab25bd6414dc60a5f21620b8397c326c (diff) | |
| parent | 27775e89a50021cab7938079d2da431c3bd75a47 (diff) | |
| download | forums-196ed8ef9f063eb4293e740725d1f1c31276fed9.tar forums-196ed8ef9f063eb4293e740725d1f1c31276fed9.tar.gz forums-196ed8ef9f063eb4293e740725d1f1c31276fed9.tar.bz2 forums-196ed8ef9f063eb4293e740725d1f1c31276fed9.tar.xz forums-196ed8ef9f063eb4293e740725d1f1c31276fed9.zip | |
Merge PR #786 branch 'brunoais/ticket/10845' into develop
* brunoais/ticket/10845:
[ticket/10845] Removed one empty line that wasn't supposed to be there
[ticket/10845] Two of the three colouns were missing in the DB update file
[ticket/10845] Remove censor from text
[ticket/10845] Now it shows the preview post parsed
[ticket/10845] Changed the report system. Now it saves posts with the bbcode
Conflicts:
phpBB/includes/functions_content.php
Diffstat (limited to 'phpBB/includes/functions_content.php')
| -rw-r--r-- | phpBB/includes/functions_content.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index e7772e14fe..c54cc25f34 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -408,7 +408,7 @@ function strip_bbcode(&$text, $uid = '') * For display of custom parsed text on user-facing pages * Expects $text to be the value directly from the database (stored value) */ -function generate_text_for_display($text, $uid, $bitfield, $flags) +function generate_text_for_display($text, $uid, $bitfield, $flags, $censor_text = true) { static $bbcode; global $phpbb_dispatcher; @@ -418,8 +418,6 @@ function generate_text_for_display($text, $uid, $bitfield, $flags) return ''; } - $censor_text = true; - /** * Use this event to modify the text before it is parsed * |