Changeset 363

Timestamp:

Nov 17, 2009 4:12:31 PM (14 years ago)

Author:

quinn

Message:

Fixed a bug in the humanTime() function.

File:

• trunk/lib/Utilities.inc.php (modified) (1 diff)

trunk/lib/Utilities.inc.php

@@ -379 +379 @@
 
     $final_time = $seconds;
-    $last_unit = 'second';
+    $final_unit = 'second';
     foreach ($units as $k => $v) {
-        if ($max_unit != $k && $seconds >= $v[0]) {
+        if ($seconds >= $v[0]) {
             $final_time = $seconds / $v[0];
-            $last_unit = $k;
+            $final_unit = $k;
+        }
+        if ($max_unit == $final_unit) {
+            break;
         }
     }
     $final_time = sprintf($format, $final_time);
-    return sprintf('%s %s', $final_time, (1 == $final_time ? $units[$last_unit][1] : $units[$last_unit][2]));    
+    return sprintf('%s %s', $final_time, (1 == $final_time ? $units[$final_unit][1] : $units[$final_unit][2]));    
 }