diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-01-16 23:18:13 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-01-16 23:18:13 +0100 |
| commit | a98f12d1fc490dc521f9fbd2652446e8f1241f4c (patch) | |
| tree | 3554a3cb470e40ae16bbae408ca927174c1a907f /phpBB | |
| parent | 8e5b5a5c07863f3ea36a5b506bd7a5ebf277415b (diff) | |
| parent | 12a10de0d1b6ac053caa7689d4bb6f1ea437f0f1 (diff) | |
| download | forums-a98f12d1fc490dc521f9fbd2652446e8f1241f4c.tar forums-a98f12d1fc490dc521f9fbd2652446e8f1241f4c.tar.gz forums-a98f12d1fc490dc521f9fbd2652446e8f1241f4c.tar.bz2 forums-a98f12d1fc490dc521f9fbd2652446e8f1241f4c.tar.xz forums-a98f12d1fc490dc521f9fbd2652446e8f1241f4c.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 1c7e68d358..be2e9e125e 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -2791,9 +2791,9 @@ function get_database_size() { $version = $row['mysql_version']; - if (preg_match('#(3\.23|[45]\.)#', $version)) + if (preg_match('#(3\.23|[45]\.|10\.[0-9]\.[0-9]{1,2}-+Maria)#', $version)) { - $db_name = (preg_match('#^(?:3\.23\.(?:[6-9]|[1-9]{2}))|[45]\.#', $version)) ? "`{$db->get_db_name()}`" : $db->get_db_name(); + $db_name = (preg_match('#^(?:3\.23\.(?:[6-9]|[1-9]{2}))|[45]\.|10\.[0-9]\.[0-9]{1,2}-+Maria#', $version)) ? "`{$db->get_db_name()}`" : $db->get_db_name(); $sql = 'SHOW TABLE STATUS FROM ' . $db_name; |