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

wonderful, another change... now come slap me to death... conquering mars.

Browse source 
git-svn-id: file:///svn/phpbb/trunk@8269 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2007-12-05 16:34:38 +00:00
parent 7c793ba9d7
commit 0881e608f8
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/docs/CHANGELOG.html
View file

@ -83,7 +83,8 @@
<a name="v30rc8"></a><h3>1.i. Changes since 3.0.RC8</h3> <a name="v30rc8"></a><h3>1.i. Changes since 3.0.RC8</h3>
<ul> <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 &quot;a_name&quot; and &quot;a__name&quot; are treated as the same name (Bug #15634)</li>
<li>[Fix] Check &quot;able to disable word censor&quot; option while applying word censor on text (Bug #15974)</li>
</ul> </ul>
<a name="v30rc7"></a><h3>1.ii. Changes since 3.0.RC7</h3> <a name="v30rc7"></a><h3>1.ii. Changes since 3.0.RC7</h3>

7
phpBB/includes/cache.php
View file

@ -73,12 +73,7 @@ class cache extends acm
*/ */
function obtain_word_list() function obtain_word_list()
{ {
global $config, $user, $db; global $db;
if (!$user->optionget('viewcensors') && $config['allow_nocensors'])
{
return array();
}
if (($censors = $this->get('_word_censors')) === false) if (($censors = $this->get('_word_censors')) === false)
{ {

1
phpBB/includes/functions.php
View file

@ -2837,6 +2837,7 @@ function phpbb_checkdnsrr($host, $type = '')
return NULL; return NULL;
} }
// @exec('nslookup -retry=1 -timout=1 -type=' . escapeshellarg($type) . ' ' . escapeshellarg($host), $output);
@exec('nslookup -type=' . escapeshellarg($type) . ' ' . escapeshellarg($host), $output); @exec('nslookup -type=' . escapeshellarg($type) . ' ' . escapeshellarg($host), $output);
// If output is empty, the nslookup failed // If output is empty, the nslookup failed