This commit is contained in:
Robert Gruendler 2012-12-05 21:09:07 +01:00
commit 71531d606b

View file

@ -180,8 +180,12 @@ abstract class ProgressHelper implements HelperInterface
{ {
$ar = array_reverse(explode(":", $rawDuration)); $ar = array_reverse(explode(":", $rawDuration));
$duration = floatval($ar[0]); $duration = floatval($ar[0]);
if (!empty($ar[1])) $duration += intval($ar[1]) * 60; if (!empty($ar[1])) {
if (!empty($ar[2])) $duration += intval($ar[2]) * 60 * 60; $duration += intval($ar[1]) * 60;
}
if (!empty($ar[2])) {
$duration += intval($ar[2]) * 60 * 60;
}
return $duration; return $duration;
} }
@ -196,10 +200,6 @@ abstract class ProgressHelper implements HelperInterface
} }
return array( return array(
/*
'currentSize' => $this->currentSize,
'currentTime' => $this->currentTime,
*/
'percent' => $this->percent, 'percent' => $this->percent,
'remaining' => $this->remaining, 'remaining' => $this->remaining,
'rate' => $this->rate 'rate' => $this->rate