From 63570bc30ff13d05f9e4cbdad3f8e6e05bef0584 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 7 Apr 2015 10:20:12 +0530 Subject: [PATCH] bug #4841 Status page: Mislukte pogingen per uur value is incorrect Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + libraries/Util.class.php | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b1f5d82894..e1336706b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog 4.4.2.0 (not yet released) - bug #4835 PMA_hideShowConnection not called after submit_num_fields - bug #4836 Server warning after moving from console to direct clicks +- bug #4841 Status page: Mislukte pogingen per uur value is incorrect 4.4.1.0 (not yet released) - bug #4813 MySQL 5.7.6 and the Users menu tab diff --git a/libraries/Util.class.php b/libraries/Util.class.php index 780bade05e..32f9150ba8 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -1498,19 +1498,19 @@ class PMA_Util // If we don't want any zeros after the comma just add the thousand separator if ($noTrailingZero) { - $value = self::localizeNumber( + $localizedValue = self::localizeNumber( preg_replace('/(?<=\d)(?=(\d{3})+(?!\d))/', ',', $value) ); } else { //number_format is not multibyte safe, str_replace is safe - $value = self::localizeNumber(number_format($value, $digits_right)); + $localizedValue = self::localizeNumber(number_format($value, $digits_right)); } if ($originalValue != 0 && floatval($value) == 0) { - return ' <' . (1 / self::pow(10, $digits_right)) . ' ' . $unit; + return ' <' . self::localizeNumber((1 / self::pow(10, $digits_right))) . ' ' . $unit; } - return $sign . $value . ' ' . $unit; + return $sign . $localizedValue . ' ' . $unit; } // end of the 'formatNumber' function /**