From 9e77c61850ec073372fa520c5de8bb8ff36f1a83 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 8 Jan 2012 20:15:08 +0000
Subject: [PATCH] * bug 33571: fix yottabits/s in Language::formatBitrate

Problem was caused by inexact floating-point comparisons with values returned from
log10(); worked around by simply duplicating the very similar code in the function
immediately below, which does the same thing with 1024 instead of 1000 unit sizes,
uses only simple division, and passes the test cases.
---
 languages/Language.php | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/languages/Language.php b/languages/Language.php
index 56367dbf7a..fe9f1b83a0 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -3816,28 +3816,29 @@ class Language {
 	 * @return string
 	 */
 	function formatBitrate( $bps ) {
-		$units = array( '', 'kilo', 'mega', 'giga', 'tera', 'peta', 'exa', 'zeta', 'yotta' );
 		if ( $bps <= 0 ) {
 			return str_replace( '$1', $this->formatNum( $bps ), $this->getMessageFromDB( 'bitrate-bits' ) );
 		}
-		$unitIndex = (int)floor( log10( $bps ) / 3 );
-		$mantissa = $bps / pow( 1000, $unitIndex );
+		$units = array( '', 'kilo', 'mega', 'giga', 'tera', 'peta', 'exa', 'zeta', 'yotta' );
+		$index = 0;
 
 		$maxIndex = count( $units ) - 1;
-
-		if ( $unitIndex  > $maxIndex ) {
-			// Prevent code falling off end of $units array
-			$mantissa *= ( $unitIndex - $maxIndex ) * 1000;
-			$unitIndex = $maxIndex;
+		while ( $bps >= 1000 && $index < $maxIndex ) {
+			$index++;
+			$bps /= 1000;
 		}
-		if ( $mantissa < 10 ) {
-			$mantissa = round( $mantissa, 1 );
-		} else {
-			$mantissa = round( $mantissa );
+
+		// For small units no decimal places necessary
+		$round = 0;
+		if ( $index > 1 ) {
+			// For MB and bigger two decimal places are smarter
+			$round = 2;
 		}
-		$msg = "bitrate-{$units[$unitIndex]}bits";
+		$msg = "bitrate-{$units[$index]}bits";
+
+		$bps = round( $bps, $round );
 		$text = $this->getMessageFromDB( $msg );
-		return str_replace( '$1', $this->formatNum( $mantissa ), $text );
+		return str_replace( '$1', $this->formatNum( $bps ), $text );
 	}
 
 	/**
-- 
2.20.1