aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_prefs.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2009-07-08 13:03:43 +0000
committerJoas Schilling <nickvergessen@gmx.de>2009-07-08 13:03:43 +0000
commit51885a2734bea8f77e9be0f536942fb6bf305163 (patch)
treefca762dcef5330288d91ed6b00385adc92095a9f /phpBB/includes/ucp/ucp_prefs.php
parent1c6e99848f9663792051c6bd84b6159b5ad57a4e (diff)
downloadforums-51885a2734bea8f77e9be0f536942fb6bf305163.tar
forums-51885a2734bea8f77e9be0f536942fb6bf305163.tar.gz
forums-51885a2734bea8f77e9be0f536942fb6bf305163.tar.bz2
forums-51885a2734bea8f77e9be0f536942fb6bf305163.tar.xz
forums-51885a2734bea8f77e9be0f536942fb6bf305163.zip
Fix bug #47575 - Disable word-censor option in UCP lacks the config-setting - Patch by 00mohgta7
Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9734 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_prefs.php')
-rw-r--r--phpBB/includes/ucp/ucp_prefs.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php
index 9b705fba6c..cc8565e69d 100644
--- a/phpBB/includes/ucp/ucp_prefs.php
+++ b/phpBB/includes/ucp/ucp_prefs.php
@@ -282,7 +282,7 @@ class ucp_prefs
'S_AVATARS' => $data['avatars'],
'S_DISABLE_CENSORS' => $data['wordcensor'],
- 'S_CHANGE_CENSORS' => ($auth->acl_get('u_chgcensors')) ? true : false,
+ 'S_CHANGE_CENSORS' => ($auth->acl_get('u_chgcensors') && $config['allow_nocensors']) ? true : false,
'S_TOPIC_SORT_DAYS' => $s_limit_topic_days,
'S_TOPIC_SORT_KEY' => $s_sort_topic_key,