From d89f60f182afa07e28d4e58f59b90dd25555e3a6 Mon Sep 17 00:00:00 2001 From: Meik Sievertsen Date: Sun, 12 Nov 2006 15:35:43 +0000 Subject: consistant obtain_* functions git-svn-id: file:///svn/phpbb/trunk@6572 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'phpBB/includes/functions.php') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 17c15fda30..814dcc74af 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2387,10 +2387,8 @@ function censor_text($text) if (!isset($censors) || !is_array($censors)) { - $censors = array(); - // obtain_word_list is taking care of the users censor option and the board-wide option - $cache->obtain_word_list($censors); + $censors = $cache->obtain_word_list(); } if (sizeof($censors)) @@ -2466,9 +2464,7 @@ function extension_allowed($forum_id, $extension, &$extensions) if (!sizeof($extensions)) { global $cache; - - $extensions = array(); - $cache->obtain_attach_extensions($extensions); + $extensions = $cache->obtain_attach_extensions(); } if (!isset($extensions['_allowed_'][$extension])) -- cgit v1.2.1