From efb5bfdc89ec3be45d748347c0886cc37efdf637 Mon Sep 17 00:00:00 2001 From: Max Base Date: Thu, 6 Feb 2020 18:32:36 +0330 Subject: [PATCH] Fix #15926 - PhpMyAdmin\Core::getRealSize Signed-off-by: Seyyed Ali Mohammadieh --- libraries/classes/Core.php | 2 +- test/classes/CoreTest.php | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php index 5a7ee91e23..9994994810 100644 --- a/libraries/classes/Core.php +++ b/libraries/classes/Core.php @@ -438,7 +438,7 @@ class Core ]; if (preg_match('/^([0-9]+)([KMGT])/i', $size, $matches)) { - return $matches[1] * $binaryprefixes[$matches[2]]; + return (int) ($matches[1] * $binaryprefixes[$matches[2]]); } return (int) $size; diff --git a/test/classes/CoreTest.php b/test/classes/CoreTest.php index 0b09848b82..16dac440a2 100644 --- a/test/classes/CoreTest.php +++ b/test/classes/CoreTest.php @@ -567,6 +567,14 @@ class CoreTest extends PmaTestCase '1024', 1024, ], + [ + '8000m', + 8 * 1000 * 1024 * 1024, + ], + [ + '8G', + 8 * 1024 * 1024 * 1024, + ], ]; }