An hour is >= 60 minutes, not just > ... and so on.

This commit is contained in:
Andrew McMillan 2006-12-17 21:37:05 +13:00
parent 2e50a0721a
commit cea76a8fbb

View File

@ -314,7 +314,7 @@ class iCalDate {
/** Also somewhat simpler if we can use seconds */ /** Also somewhat simpler if we can use seconds */
$diff = $from->_epoch - $this->_epoch; $diff = $from->_epoch - $this->_epoch;
$result = ""; $result = "";
if ( $diff > 86400) { if ( $diff >= 86400) {
$result = intval($diff / 86400); $result = intval($diff / 86400);
$diff = $diff % 86400; $diff = $diff % 86400;
if ( $diff == 0 && (($result % 7) == 0) ) { if ( $diff == 0 && (($result % 7) == 0) ) {
@ -325,11 +325,11 @@ class iCalDate {
$result .= "D"; $result .= "D";
} }
$result = "P".$result."T"; $result = "P".$result."T";
if ( $diff > 3600) { if ( $diff >= 3600) {
$result .= intval($diff / 3600) . "H"; $result .= intval($diff / 3600) . "H";
$diff = $diff % 3600; $diff = $diff % 3600;
} }
if ( $diff > 60) { if ( $diff >= 60) {
$result .= intval($diff / 60) . "M"; $result .= intval($diff / 60) . "M";
$diff = $diff % 60; $diff = $diff % 60;
} }