diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-12-30 17:20:50 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-12-30 17:20:50 +0000 |
| commit | 11e76473aaf0120a96edb4d3a96800603bffcc48 (patch) | |
| tree | 3b237d67fe83359ab17a99d151f52ad170500c74 /phpBB/includes/functions.php | |
| parent | 96721d4bf141cd607ab47aa6f60ed33579475457 (diff) | |
| download | forums-11e76473aaf0120a96edb4d3a96800603bffcc48.tar forums-11e76473aaf0120a96edb4d3a96800603bffcc48.tar.gz forums-11e76473aaf0120a96edb4d3a96800603bffcc48.tar.bz2 forums-11e76473aaf0120a96edb4d3a96800603bffcc48.tar.xz forums-11e76473aaf0120a96edb4d3a96800603bffcc48.zip | |
fix some functions
git-svn-id: file:///svn/phpbb/trunk@9245 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index f66d954ea8..9ca0424791 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -78,19 +78,17 @@ function set_config($config_name, $config_value, $is_dynamic = false) */ function get_formatted_filesize($bytes, $add_size_lang = true) { - global $user; - if ($bytes >= pow(2, 20)) { - return ($add_size_lang) ? round($bytes / 1024 / 1024, 2) . ' ' . $user->lang['MIB'] : round($bytes / 1024 / 1024, 2); + return ($add_size_lang) ? round($bytes / 1024 / 1024, 2) . ' ' . phpbb::$user->lang['MIB'] : round($bytes / 1024 / 1024, 2); } if ($bytes >= pow(2, 10)) { - return ($add_size_lang) ? round($bytes / 1024, 2) . ' ' . $user->lang['KIB'] : round($bytes / 1024, 2); + return ($add_size_lang) ? round($bytes / 1024, 2) . ' ' . phpbb::$user->lang['KIB'] : round($bytes / 1024, 2); } - return ($add_size_lang) ? ($bytes) . ' ' . $user->lang['BYTES'] : ($bytes); + return ($add_size_lang) ? ($bytes) . ' ' . phpbb::$user->lang['BYTES'] : ($bytes); } /** @@ -2608,7 +2606,7 @@ function page_footer($run_cron = true) $mtime = explode(' ', microtime()); $totaltime = $mtime[0] + $mtime[1] - $starttime; - if (request::variable('explain', false) && /*phpbb::$acl->acl_get('a_') &&*/ defined('DEBUG_EXTRA') && method_exists(phpbb::$db, 'sql_report')) + if (phpbb_request::variable('explain', false) && /*phpbb::$acl->acl_get('a_') &&*/ defined('DEBUG_EXTRA') && method_exists(phpbb::$db, 'sql_report')) { phpbb::$db->sql_report('display'); } |