1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 08:47:45 +02:00

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
This commit is contained in:
Meik Sievertsen
2009-01-20 16:54:15 +00:00
parent b55f9854e7
commit cd4091af43
19 changed files with 154 additions and 219 deletions

View File

@@ -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'];
}