diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2009-07-08 13:03:43 +0000 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2009-07-08 13:03:43 +0000 |
| commit | 51885a2734bea8f77e9be0f536942fb6bf305163 (patch) | |
| tree | fca762dcef5330288d91ed6b00385adc92095a9f | |
| parent | 1c6e99848f9663792051c6bd84b6159b5ad57a4e (diff) | |
| download | forums-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
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_prefs.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index f693776f57..3438944736 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -147,6 +147,7 @@ <li>[Fix] Further word censor fix to work with UTF8 correctly. (Patch by rxu)</li> <li>[Fix] View end of ban in MCP and ACP when user is banned by duration (Bug #47815 - Patch by Pyramide)</li> <li>[Fix] Display user's posts count in private message when it is equal to 0 (prosilver). (Bug #40155 - Patch by rxu)</li> + <li>[Fix] Disable word-censor option in UCP lacks the config-setting (Bug #47575 - Patch by 00mohgta7)</li> <li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li> <li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li> <li>[Change] Template engine now permits to a limited extent variable includes.</li> 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, |