From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Sun, 19 Jun 2011 09:27:08 +0000 (+0000)
Subject: Added back some rounding code lost in r90385
X-Git-Tag: 1.31.0-rc.0~29422
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=7ea7f9c238b33560b96678a19a3c2e8de1adaa11;p=lhc%2Fweb%2Fwiklou.git

Added back some rounding code lost in r90385
---

diff --git a/languages/Language.php b/languages/Language.php
index 0a5fc25c7b..26fdbc5ac0 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -3436,7 +3436,15 @@ class Language {
 		} elseif ( round( $seconds ) <= 2*86400 ) {
 			$hours = floor( $seconds / 3600 );
 			$minutes = floor( ( $seconds - $hours * 3600 ) / 60 );
-			$secondsPart = floor( $seconds - $hours * 3600 - $minutes * 60 );
+			$secondsPart = round( $seconds - $hours * 3600 - $minutes * 60 );
+			if ( $secondsPart == 60 ) {
+				$secondsPart = 0;
+				$minutes++;
+			}
+			if ( $minutes == 60 ) {
+				$minutes = 0;
+				$hours++;
+			}
 			$s = $this->formatNum( $hours ) . $this->getMessageFromDB( 'hours-abbrev' ) .
 				' ' .
 				$this->formatNum( $minutes ) . $this->getMessageFromDB( 'minutes-abbrev' );