mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-01 14:30:32 +02:00
consistant obtain_* functions
git-svn-id: file:///svn/phpbb/trunk@6572 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -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]))
|
||||
|
Reference in New Issue
Block a user