fix redirect target for non default article redirect targets

fritzmg · Aug 30, 2018 · 23faa6a · 23faa6a
1 parent ae6cd43
commit 23faa6a
Showing 1 changed file with 13 additions and 22 deletions.
diff --git a/system/modules/newslist_extended/classes/NewslistExtended.php b/system/modules/newslist_extended/classes/NewslistExtended.php
@@ -73,31 +73,22 @@ public function parseArticles($objTemplate, $arrArticle, $objModule)
 			return;
 		}
 
-		// check if override is active and only override for default articles
-		if (!$objModule->news_overrideRedirect)
+		// check if a custom redirect page is set and the article has no redirects on its own
+		if ('default' === $arrArticle['source']
+		 && $objModule->news_overrideRedirect 
+		 && $objModule->jumpTo 
+		 && null !== ($objTarget = \PageModel::findById($objModule->jumpTo)))
 		{
-			return;
-		}
+			// build the href
+			$strHref = \Controller::generateFrontendUrl($objTarget->row(), ((\Config::get('useAutoItem') && !\Config::get('disableAlias')) ?  '/' : '/items/') . ((!\Config::get('disableAlias') && $arrArticle['alias'] != '') ? $arrArticle['alias'] : $arrArticle['id']), $objTarget->rootLanguage, true);
 
-		// get current page object
-		global $objPage;
+			// encode href
+			$strHref = ampersand($strHref);
 
-		// check if a custom redirect page is set
-		if ($objModule->jumpTo && null !== ($objTarget = \PageModel::findById($objModule->jumpTo)))
-		{
-			// override the target page
-			$objPage = $objTarget;
+			// update links
+			$objTemplate->link = $strHref;
+			$objTemplate->linkHeadline = $this->generateNewsLink( $strHref, $arrArticle['headline'], $arrArticle['headline']);
+			$objTemplate->more = $this->generateNewsLink( $strHref, $arrArticle['headline'], $GLOBALS['TL_LANG']['MSC']['more'], true);
 		}
-
-		// build the href
-		$strHref = \Controller::generateFrontendUrl($objPage->row(), ((\Config::get('useAutoItem') && !\Config::get('disableAlias')) ?  '/' : '/items/') . ((!\Config::get('disableAlias') && $arrArticle['alias'] != '') ? $arrArticle['alias'] : $arrArticle['id']), $objPage->rootLanguage, true);
-
-		// encode href
-		$strHref = ampersand($strHref);
-
-		// update links
-		$objTemplate->link = $strHref;
-		$objTemplate->linkHeadline = $this->generateNewsLink( $strHref, $arrArticle['headline'], $arrArticle['headline']);
-		$objTemplate->more = $this->generateNewsLink( $strHref, $arrArticle['headline'], $GLOBALS['TL_LANG']['MSC']['more'], true);
 	}
 }