Version 4.7.23

applications/cms/extensions/core/FrontNavigation/Pages.php

@@ -172,7 +172,22 @@ class _Pages extends \IPS\core\FrontNavigation\FrontNavigationAbstract
 	 */
 	public function active()
 	{
-		return ( \IPS\cms\Pages\Page::$currentPage and \IPS\cms\Pages\Page::$currentPage->id == $this->configuration['menu_content_page'] );
+		$page = \IPS\cms\Pages\Page::$currentPage;
+		if ( !$page )
+		{
+			return false;
+		}
+
+		try
+		{
+			if ( $db = $page->getDatabase() and $db->allow_club_categories and $categoryClass = '\\IPS\\cms\\Categories' . $db->id and \IPS\cms\Databases\Dispatcher::i()->categoryId and $categoryClass::load( \IPS\cms\Databases\Dispatcher::i()->categoryId )->club() )
+			{
+				return false;
+			}
+		}
+		catch ( \OutOfRangeException|\OutOfBoundsException ) {}
+
+		return $page->id == $this->configuration['menu_content_page'];
 	}
 	
 	/**