Skip to content

Commit

Permalink
Fix fatal error when there are conflicts (introduced in a recent merge).
Browse files Browse the repository at this point in the history
  • Loading branch information
campbell-m committed Aug 7, 2023
1 parent f9f0897 commit 62023c0
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions web/edit_entry_handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -617,12 +617,12 @@ function invalid_booking(string $message) : void
$repeat_rule->setMonthlyRelative($month_relative);
if (isset($rep_end_date))
{
$end_date = DateTime::createFromFormat('Y-m-d', $rep_end_date);
if ($end_date === false)
$repeat_end_date = DateTime::createFromFormat('Y-m-d', $rep_end_date);
if ($repeat_end_date === false)
{
throw new Exception("Could not create repeat end date");
}
$repeat_rule->setEndDate($end_date);
$repeat_rule->setEndDate($repeat_end_date);
}

if ($repeat_rule->getType() == RepeatRule::WEEKLY)
Expand Down

0 comments on commit 62023c0

Please sign in to comment.