Skip to content

Commit

Permalink
Merge branch '4.7'
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
#	core-bundle/src/Resources/contao/config/constants.php
#	core-bundle/src/Resources/contao/languages/ru/default.xlf
#	core-bundle/src/Resources/contao/languages/ru/tl_opt_in.xlf
#	core-bundle/tests/Image/PictureFactoryTest.php
  • Loading branch information
leofeyer committed Apr 11, 2019
2 parents 6c8f949 + 2030252 commit 86b2c5c
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions src/Resources/contao/dca/tl_calendar_events.php
Expand Up @@ -657,11 +657,6 @@ public function checkPermission()
$objCalendar = $this->Database->prepare("SELECT id FROM tl_calendar_events WHERE pid=?")
->execute($id);

if ($objCalendar->numRows < 1)
{
throw new Contao\CoreBundle\Exception\AccessDeniedException('Invalid calendar ID ' . $id . '.');
}

/** @var Symfony\Component\HttpFoundation\Session\SessionInterface $objSession */
$objSession = Contao\System::getContainer()->get('session');

Expand Down

0 comments on commit 86b2c5c

Please sign in to comment.