diff --git a/cis/private/lvplan/stpl_kalender.php b/cis/private/lvplan/stpl_kalender.php index 3b5129358..6d1d2f42e 100644 --- a/cis/private/lvplan/stpl_kalender.php +++ b/cis/private/lvplan/stpl_kalender.php @@ -119,7 +119,7 @@ if(!isset($begin)) $datum_obj = new datum(); $diff = $datum_obj->DateDiff($objSS->ende, date('Y-m-d H:i:s')); - if($diff<=30 & $diff>0) + if($diff>=-30) { $objSS->getNextFrom($ss); $ende = $datum_obj->mktime_fromdate($objSS->ende); @@ -341,4 +341,4 @@ else echo '

'.$p->t('lvplan/fehlerUndFeedback').' '.$p->t('lvplan/lvKoordinationsstelle').'

'; echo ''; } -?> \ No newline at end of file +?> diff --git a/include/datum.class.php b/include/datum.class.php index 1d2e8411c..bfeddc654 100644 --- a/include/datum.class.php +++ b/include/datum.class.php @@ -170,7 +170,7 @@ class datum $datetime1 = new DateTime($datum1); $datetime2 = new DateTime($datum2); $interval = $datetime1->diff($datetime2); - return $interval->format('%R%d'); + return $interval->format('%R%a'); } /**