diff options
author | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-05-20 12:16:25 +0000 |
---|---|---|
committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2003-05-20 12:16:25 +0000 |
commit | 208a3b96bfc5bb2dfb2b0e21fb658c31f062e0f2 (patch) | |
tree | d35dd7e4baf973ed4715044eb09b22e904d9bb24 /phpBB/includes/functions.php | |
parent | d43770db28cd04b9f3ac2d12283d875782a53713 (diff) | |
download | forums-208a3b96bfc5bb2dfb2b0e21fb658c31f062e0f2.tar forums-208a3b96bfc5bb2dfb2b0e21fb658c31f062e0f2.tar.gz forums-208a3b96bfc5bb2dfb2b0e21fb658c31f062e0f2.tar.bz2 forums-208a3b96bfc5bb2dfb2b0e21fb658c31f062e0f2.tar.xz forums-208a3b96bfc5bb2dfb2b0e21fb658c31f062e0f2.zip |
More functions added ...
git-svn-id: file:///svn/phpbb/trunk@4025 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r-- | phpBB/includes/functions.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index b5a37e6bb3..b45dea5059 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -728,11 +728,16 @@ function on_page($num_items, $per_page, $start) // to return both sets of arrays function obtain_word_list(&$censors) { - global $db, $cache; + global $db, $cache, $user; + + if (!$user->data['user_viewcensors'] && !$user->data['coppa'] && $config['allow_nocensors']) + { + return; + } if ($cache->exists('word_censors')) { - $censors = $cache->get('word_censors'); // transfer to just if (!(...)) ? works fine for me + $censors = $cache->get('word_censors'); } else { |