diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-01-21 17:37:15 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-01-21 17:37:15 +0100 |
| commit | 10756f3f87efac29448a48207548d5b71a3206b9 (patch) | |
| tree | 67cccd3efcf52f25f91bdabc15cb290385048d38 /phpBB/includes/functions_admin.php | |
| parent | 77d033f99e4acfb928632683da108d599eea9007 (diff) | |
| parent | 91fbdd9ff83c88cc52649964518eca1f1220372f (diff) | |
| download | forums-10756f3f87efac29448a48207548d5b71a3206b9.tar forums-10756f3f87efac29448a48207548d5b71a3206b9.tar.gz forums-10756f3f87efac29448a48207548d5b71a3206b9.tar.bz2 forums-10756f3f87efac29448a48207548d5b71a3206b9.tar.xz forums-10756f3f87efac29448a48207548d5b71a3206b9.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/includes/functions_admin.php')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index be2e9e125e..a0073ec158 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -2802,7 +2802,7 @@ function get_database_size() $database_size = 0; while ($row = $db->sql_fetchrow($result)) { - if ((isset($row['Type']) && $row['Type'] != 'MRG_MyISAM') || (isset($row['Engine']) && ($row['Engine'] == 'MyISAM' || $row['Engine'] == 'InnoDB'))) + if ((isset($row['Type']) && $row['Type'] != 'MRG_MyISAM') || (isset($row['Engine']) && ($row['Engine'] == 'MyISAM' || $row['Engine'] == 'InnoDB' || $row['Engine'] == 'Aria'))) { if ($table_prefix != '') { |