diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-01-20 16:54:15 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-01-20 16:54:15 +0000 |
| commit | cd4091af43fa2d7d3dbe5ad0d583c63f1d96c903 (patch) | |
| tree | b60c6980ad85e4a8daf48a10c3ab9e2efa4f29c2 /phpBB/includes/functions_admin.php | |
| parent | b55f9854e770ba7c37e0e1914c8570c856cbecf3 (diff) | |
| download | forums-cd4091af43fa2d7d3dbe5ad0d583c63f1d96c903.tar forums-cd4091af43fa2d7d3dbe5ad0d583c63f1d96c903.tar.gz forums-cd4091af43fa2d7d3dbe5ad0d583c63f1d96c903.tar.bz2 forums-cd4091af43fa2d7d3dbe5ad0d583c63f1d96c903.tar.xz forums-cd4091af43fa2d7d3dbe5ad0d583c63f1d96c903.zip | |
i am not sure if people will like the config layout i test here... it requires the framework at least being present
git-svn-id: file:///svn/phpbb/trunk@9281 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_admin.php')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 856db6ebf6..79664fe6d1 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -2707,8 +2707,6 @@ function view_warned_users(&$users, &$user_count, $limit = 0, $offset = 0, $limi */ function get_database_size() { - global $table_prefix; - $database_size = false; // This code is heavily influenced by a similar routine in phpMyAdmin 2.2.0 @@ -2737,9 +2735,9 @@ function get_database_size() { if ((isset($row['Type']) && $row['Type'] != 'MRG_MyISAM') || (isset($row['Engine']) && ($row['Engine'] == 'MyISAM' || $row['Engine'] == 'InnoDB'))) { - if ($table_prefix != '') + if (phpbb::$base_config['table_prefix'] != '') { - if (strpos($row['Name'], $table_prefix) !== false) + if (strpos($row['Name'], phpbb::$base_config['table_prefix']) !== false) { $database_size += $row['Data_length'] + $row['Index_length']; } |