diff options
| author | David M <davidmj@users.sourceforge.net> | 2008-01-03 17:00:40 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2008-01-03 17:00:40 +0000 |
| commit | 85055ac97fa57ca339924cef719115d85bdf6c2e (patch) | |
| tree | 1e19230af2689c3837356c0f7947719c0cdf67ef /phpBB/includes/functions_content.php | |
| parent | 0f26ffbadea13d97b841dfe56b21da7a5479000a (diff) | |
| download | forums-85055ac97fa57ca339924cef719115d85bdf6c2e.tar forums-85055ac97fa57ca339924cef719115d85bdf6c2e.tar.gz forums-85055ac97fa57ca339924cef719115d85bdf6c2e.tar.bz2 forums-85055ac97fa57ca339924cef719115d85bdf6c2e.tar.xz forums-85055ac97fa57ca339924cef719115d85bdf6c2e.zip | |
oh boy...
- Migrate code base to PHP 5.1+
git-svn-id: file:///svn/phpbb/trunk@8295 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_content.php')
| -rw-r--r-- | phpBB/includes/functions_content.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index c0acd2eb41..b601e3a60c 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -660,7 +660,7 @@ function censor_text($text) } else { - $censors = $cache->obtain_word_list(); + $censors = cache::obtain_word_list(); } } @@ -722,6 +722,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count, // $compiled_attachments = array(); + // @todo: do we really need this check? if (!isset($template->filename['attachment_tpl'])) { $template->set_filenames(array( @@ -731,7 +732,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count, if (empty($extensions) || !is_array($extensions)) { - $extensions = $cache->obtain_attach_extensions($forum_id); + $extensions = cache::obtain_attach_extensions($forum_id); } // Look for missing attachment information... @@ -1046,7 +1047,7 @@ function extension_allowed($forum_id, $extension, &$extensions) if (empty($extensions)) { global $cache; - $extensions = $cache->obtain_attach_extensions($forum_id); + $extensions = cache::obtain_attach_extensions($forum_id); } return (!isset($extensions['_allowed_'][$extension])) ? false : true; @@ -1187,7 +1188,7 @@ class bitfield { var $data; - function bitfield($bitfield = '') + function __construct($bitfield = '') { $this->data = base64_decode($bitfield); } |