Version 4.2.0

applications/core/sources/FrontNavigation/FrontNavigation.php

@@ -1,13 +1,12 @@
 <?php
 /**
  * @brief		Front Navigation Handler
- * @author		<a href='http://www.invisionpower.com'>Invision Power Services, Inc.</a>
- * @copyright	(c) 2001 - 2016 Invision Power Services, Inc.
- * @license		http://www.invisionpower.com/legal/standards/
- * @package		IPS Community Suite
+ * @author		<a href='https://www.invisioncommunity.com'>Invision Power Services, Inc.</a>
+ * @copyright	(c) Invision Power Services, Inc.
+ * @license		https://www.invisioncommunity.com/legal/standards/
+ * @package		Invision Community
  * @subpackage	Core
  * @since		30 Jun 2015
- * @version		SVN_VERSION_NUMBER
  */
 
 namespace IPS\core;
@@ -30,6 +29,11 @@ class _FrontNavigation
 	 */
 	protected static $instance = NULL;
 	
+	/**
+	 * @brief	This is a hacky flag to indicate if active page is a club area so we know which tab to highlight in the menu
+	 */
+	public static $clubTabActive = FALSE;
+	
 	/**
 	 * @brief	Store root objects for re-use later
 	 */
@@ -78,11 +82,6 @@ class _FrontNavigation
 					}
 				}
 			}
-			elseif ( !$noStore )
-			{
-				static::buildDefaultFrontNavigation();
-				return static::frontNavigation();
-			}
 			if ( $noStore )
 			{
 				return $frontNavigation;
@@ -267,12 +266,15 @@ class _FrontNavigation
 			foreach ( $frontNavigation[0] as $item )
 			{
 				$class = 'IPS\\' . $item['app'] . '\extensions\core\FrontNavigation\\' . $item['extension'];
-				$object = new $class( json_decode( $item['config'], TRUE ), $item['id'], $item['permissions'] );
-				if ( !$this->activePrimaryNavBar )
+				if ( class_exists( $class ) )
 				{
-					$this->activePrimaryNavBar = $item['id'];
+					$object = new $class( json_decode( $item['config'], TRUE ), $item['id'], $item['permissions'] );
+					if ( !$this->activePrimaryNavBar )
+					{
+						$this->activePrimaryNavBar = $item['id'];
+					}
+					$this->roots[ $item['id'] ] = $object;
 				}
-				$this->roots[ $item['id'] ] = $object;
 			}
 		}