diff options
| author | lavigor <lavigor@users.noreply.github.com> | 2016-01-14 11:30:45 +0300 |
|---|---|---|
| committer | lavigor <lavigor@users.noreply.github.com> | 2016-01-14 12:29:17 +0300 |
| commit | b34dbc2e843e56be42813a50d6d1c1d3a7eead84 (patch) | |
| tree | fd119c8f39c3f01f57065cec1ec47394f5fc3914 /phpBB/includes/functions_admin.php | |
| parent | f979d2c7b2f93bc734ae7b87debb4457f62ea24c (diff) | |
| download | forums-b34dbc2e843e56be42813a50d6d1c1d3a7eead84.tar forums-b34dbc2e843e56be42813a50d6d1c1d3a7eead84.tar.gz forums-b34dbc2e843e56be42813a50d6d1c1d3a7eead84.tar.bz2 forums-b34dbc2e843e56be42813a50d6d1c1d3a7eead84.tar.xz forums-b34dbc2e843e56be42813a50d6d1c1d3a7eead84.zip | |
[ticket/12441] Correct database size detection in MariaDB 10
PHPBB3-12441
Diffstat (limited to 'phpBB/includes/functions_admin.php')
| -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 33cf55cc0b..2b70d09fd5 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -3101,9 +3101,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; |