makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/15318] Make user option to disable word censoring effective again

Browse source 
PHPBB3-15318
This commit is contained in:
rxu 2017-08-12 17:01:34 +07:00
parent d9a5c8e918
commit 1d808931f6
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/includes/functions_content.php
View file

@ -557,6 +557,7 @@ function strip_bbcode(&$text, $uid = '')
function generate_text_for_display($text, $uid, $bitfield, $flags, $censor_text = true) function generate_text_for_display($text, $uid, $bitfield, $flags, $censor_text = true)
{ {
static $bbcode; static $bbcode;
global $auth, $config, $user;
global $phpbb_dispatcher, $phpbb_container; global $phpbb_dispatcher, $phpbb_container;
if ($text === '') if ($text === '')
@ -584,6 +585,13 @@ function generate_text_for_display($text, $uid, $bitfield, $flags, $censor_text
// Temporarily switch off viewcensors if applicable // Temporarily switch off viewcensors if applicable
$old_censor = $renderer->get_viewcensors(); $old_censor = $renderer->get_viewcensors();
// Check here if the user is having viewing censors disabled (and also allowed to do so).
if (!$user->optionget('viewcensors') && $config['allow_nocensors'] && $auth->acl_get('u_chgcensors'))
{
$censor_text = false;
}
if ($old_censor !== $censor_text) if ($old_censor !== $censor_text)
{ {
$renderer->set_viewcensors($censor_text); $renderer->set_viewcensors($censor_text);