Do not mark pages as active if there are query parameters (see #7189)

contao · Sep 26, 2014 · 952eb4d · 952eb4d
1 parent c3720ca
commit 952eb4d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/contao/modules/Module.php b/contao/modules/Module.php
@@ -317,7 +317,7 @@ protected function renderNavigation($pid, $level=1, $host=null, $language=null)
 				$trail = in_array($objSubpages->id, $objPage->trail);
 
 				// Active page
-				if (($objPage->id == $objSubpages->id || $objSubpages->type == 'forward' && $objPage->id == $objSubpages->jumpTo) && !$this instanceof \ModuleSitemap && !\Input::get('articles'))
+				if (($objPage->id == $objSubpages->id || $objSubpages->type == 'forward' && $objPage->id == $objSubpages->jumpTo) && !$this instanceof \ModuleSitemap && $href == \Environment::get('request'))
 				{
 					// Mark active forward pages (see #4822)
 					$strClass = (($objSubpages->type == 'forward' && $objPage->id == $objSubpages->jumpTo) ? 'forward' . ($trail ? ' trail' : '') : 'active') . (($subitems != '') ? ' submenu' : '') . ($objSubpages->protected ? ' protected' : '') . (($objSubpages->cssClass != '') ? ' ' . $objSubpages->cssClass : '');

diff --git a/contao/modules/ModuleCustomnav.php b/contao/modules/ModuleCustomnav.php
@@ -169,7 +169,7 @@ protected function compile()
 				$trail = in_array($arrPage['id'], $objPage->trail);
 
 				// Active page
-				if ($objPage->id == $arrPage['id'])
+				if ($objPage->id == $arrPage['id'] && $href == \Environment::get('request'))
 				{
 					$strClass = trim($arrPage['cssClass']);
 					$row = $arrPage;