gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4

Browse Source
This commit is contained in:
Weblate 2015-04-07 06:55:27 +02:00
commit 52dec48c68
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog
- bug #4836 Server warning after moving from console to direct clicks
- bug #4837 Duplicate new version notification when using the "Back" button
- bug #4839 DOC link in setting is broken
- 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

8
libraries/Util.class.php
View File

@ -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
/**