diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-12 15:35:43 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-12 15:35:43 +0000 |
| commit | d89f60f182afa07e28d4e58f59b90dd25555e3a6 (patch) | |
| tree | b326dbe53f284a7127ea8a63cccc7119dc77783d /phpBB/includes/functions.php | |
| parent | b0217ddc11799f81c8cf42961f6e0db54ce2e38e (diff) | |
| download | forums-d89f60f182afa07e28d4e58f59b90dd25555e3a6.tar forums-d89f60f182afa07e28d4e58f59b90dd25555e3a6.tar.gz forums-d89f60f182afa07e28d4e58f59b90dd25555e3a6.tar.bz2 forums-d89f60f182afa07e28d4e58f59b90dd25555e3a6.tar.xz forums-d89f60f182afa07e28d4e58f59b90dd25555e3a6.zip | |
consistant obtain_* functions
git-svn-id: file:///svn/phpbb/trunk@6572 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 8 |
1 files changed, 2 insertions, 6 deletions
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])) |