UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-10 16:44:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2787 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2021-06-07 17:36:56 -06:00 committed by GitHub
commit 658411f8b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -1,6 +1,8 @@
# Release Notes # Release Notes
## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.11.0...dev) ## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.11.0...dev)
### Updated
- Updated PrettyNumber, fix deprecated warning. ([20ec870b](https://github.com/pixelfed/pixelfed/commit/20ec870b))
## [v0.11.0 (2021-06-01)](https://github.com/pixelfed/pixelfed/compare/v0.10.10...v0.11.0) ## [v0.11.0 (2021-06-01)](https://github.com/pixelfed/pixelfed/compare/v0.10.10...v0.11.0)
### Added ### Added

3
app/Util/Lexer/PrettyNumber.php
View file

@ -14,7 +14,8 @@ class PrettyNumber
foreach ($abbrevs as $exponent => $abbrev) { foreach ($abbrevs as $exponent => $abbrev) {
if(abs($number) >= pow(10, $exponent)) { if(abs($number) >= pow(10, $exponent)) {
$display = $number / pow(10, $exponent); $display = $number / pow(10, $exponent);
$decimals = !$showDecimals ? 0 : ($exponent >= 3 && round($display) < 100) ? 1 : 0; $decimals = ($exponent >= 3 && round($display) < 100) ? 1 : 0;
$decimals = !$showDecimals ? 0 : $decimals;
$number = number_format($display, $decimals).$abbrev; $number = number_format($display, $decimals).$abbrev;
break; break;
} }