Skip to content

Commit

Permalink
fixed 500 error if no page exists
Browse files Browse the repository at this point in the history
tl_newsletter_channel jumpTo is not mandatory
  • Loading branch information
davidenke committed Sep 29, 2015
1 parent 4efbac3 commit 2d8584a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion system/modules/newsletter_content/config/autoload.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
(
// Classes
'NewsletterContent\Classes\NewsletterContent' => 'system/modules/newsletter_content/classes/NewsletterContent.php',
'NewsletterContent\Classes\NewsletterStatistics' => 'system/modules/newsletter_content/classes/NewsletterStatistics.php',
'NewsletterContent\Classes\NewsletterTracking' => 'system/modules/newsletter_content/classes/NewsletterTracking.php',
'NewsletterContent\Classes\NewsletterStatistics' => 'system/modules/newsletter_content/classes/NewsletterStatistics.php',

// Elements
'NewsletterContent\Elements\ContentBoundaries' => 'system/modules/newsletter_content/elements/ContentBoundaries.php',
Expand Down
13 changes: 8 additions & 5 deletions system/modules/newsletter_content/elements/ContentBoundaries.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,15 @@ protected function compile() {
$objNewsletter = \NewsletterModel::findByIdOrAlias($this->pid);
$objNewsletterChannel = \NewsletterChannelModel::findByIds(array($objNewsletter->pid), array('limit' => 1));

$objParent = $this->getPageDetails($objNewsletterChannel->jumpTo);
$href = ampersand($this->generateFrontendUrl($objParent->row(), sprintf((\Config::get('useAutoItem') && !\Config::get('disableAlias')) ? '/%s' : '/items/%s', $objNewsletter->alias)));
//$href = ampersand($this->generateFrontendUrl($objParent->row(), ((\Config::get('useAutoItem') && !\Config::get('disableAlias')) ? '/%s' : '/items/%s'), $objParent->language));

$this->Template->setData($objNewsletter->row());
$this->Template->view_online = $href;

if ($objNewsletterChannel->jumpTo) {
$objParent = $this->getPageDetails($objNewsletterChannel->jumpTo);
$href = ampersand($this->generateFrontendUrl($objParent->row(), sprintf((\Config::get('useAutoItem') && !\Config::get('disableAlias')) ? '/%s' : '/items/%s', $objNewsletter->alias)));
//$href = ampersand($this->generateFrontendUrl($objParent->row(), ((\Config::get('useAutoItem') && !\Config::get('disableAlias')) ? '/%s' : '/items/%s'), $objParent->language));

$this->Template->view_online = $href;
}

return;
}
Expand Down

0 comments on commit 2d8584a

Please sign in to comment.