diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-12-05 16:34:38 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-12-05 16:34:38 +0000 |
| commit | 0881e608f880b5b8060e54dbf9eba7e234eee8c6 (patch) | |
| tree | 36582595d10cb8c26f5f41a5943f89ec393e2829 | |
| parent | 7c793ba9d7e0a17cd33079e766221f9dbd47bddc (diff) | |
| download | forums-0881e608f880b5b8060e54dbf9eba7e234eee8c6.tar forums-0881e608f880b5b8060e54dbf9eba7e234eee8c6.tar.gz forums-0881e608f880b5b8060e54dbf9eba7e234eee8c6.tar.bz2 forums-0881e608f880b5b8060e54dbf9eba7e234eee8c6.tar.xz forums-0881e608f880b5b8060e54dbf9eba7e234eee8c6.zip | |
wonderful, another change... now come slap me to death... conquering mars.
git-svn-id: file:///svn/phpbb/trunk@8269 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 3 | ||||
| -rw-r--r-- | phpBB/includes/cache.php | 7 | ||||
| -rw-r--r-- | phpBB/includes/functions.php | 1 |
3 files changed, 4 insertions, 7 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index c9064a4a36..6adb9aeb99 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -83,7 +83,8 @@ <a name="v30rc8"></a><h3>1.i. Changes since 3.0.RC8</h3> <ul> - <li>[Fix] Cleaned usernames contain only single spaces, so "a_name" and "a__name" are treated as the same name (Bug #15634)</li> + <li>[Fix] Cleaned usernames contain only single spaces, so "a_name" and "a__name" are treated as the same name (Bug #15634)</li> + <li>[Fix] Check "able to disable word censor" option while applying word censor on text (Bug #15974)</li> </ul> <a name="v30rc7"></a><h3>1.ii. Changes since 3.0.RC7</h3> diff --git a/phpBB/includes/cache.php b/phpBB/includes/cache.php index 5198abdc3c..31b8b73e10 100644 --- a/phpBB/includes/cache.php +++ b/phpBB/includes/cache.php @@ -73,12 +73,7 @@ class cache extends acm */ function obtain_word_list() { - global $config, $user, $db; - - if (!$user->optionget('viewcensors') && $config['allow_nocensors']) - { - return array(); - } + global $db; if (($censors = $this->get('_word_censors')) === false) { diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 8620134311..6f1d5964f5 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2837,6 +2837,7 @@ function phpbb_checkdnsrr($host, $type = '') return NULL; } + // @exec('nslookup -retry=1 -timout=1 -type=' . escapeshellarg($type) . ' ' . escapeshellarg($host), $output); @exec('nslookup -type=' . escapeshellarg($type) . ' ' . escapeshellarg($host), $output); // If output is empty, the nslookup failed |