diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:37 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:37 +0100 |
| commit | 2ba97da524f73f3a7244cd68b7f3daee7a1933a6 (patch) | |
| tree | 2e01d3c01b99ebc51d1495c9de991690b6ed9ff5 /phpBB/includes/cache.php | |
| parent | aa4495b8ad0cf90c2b3f655441ccfee49701282d (diff) | |
| parent | 7ecd17a99310df2fecea2967ec6f97bb6b63a2e3 (diff) | |
| download | forums-2ba97da524f73f3a7244cd68b7f3daee7a1933a6.tar forums-2ba97da524f73f3a7244cd68b7f3daee7a1933a6.tar.gz forums-2ba97da524f73f3a7244cd68b7f3daee7a1933a6.tar.bz2 forums-2ba97da524f73f3a7244cd68b7f3daee7a1933a6.tar.xz forums-2ba97da524f73f3a7244cd68b7f3daee7a1933a6.zip | |
Merge commit 'release-3.0.0'
Diffstat (limited to 'phpBB/includes/cache.php')
| -rw-r--r-- | phpBB/includes/cache.php | 7 |
1 files changed, 1 insertions, 6 deletions
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) { |