1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00

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
This commit is contained in:
Oleg Pudeyev
2012-11-06 16:23:33 -05:00
12 changed files with 53 additions and 31 deletions

View File

@@ -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
*