Version 4.2.0

system/Dispatcher/Admin.php

@@ -1,12 +1,11 @@
 <?php
 /**
  * @brief		Admin CP Dispatcher
- * @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
  * @since		18 Feb 2013
- * @version		SVN_VERSION_NUMBER
  */
 
 namespace IPS\Dispatcher;
@@ -298,11 +297,6 @@ class _Admin extends \IPS\Dispatcher\Standard
 					  		{	
 					  			if ( !$item['restriction'] or \IPS\Member::loggedIn()->hasAcpRestriction( $app, $moduleToCheck, $item['restriction'] ) )
 					  			{  				
-					  				if ( !isset( $this->menu['defaults'][ $item['tab'] ] ) )
-					  				{
-					  					$this->menu['defaults'][ $item['tab'] ] = "app={$app->directory}&module={$moduleKey}&controller={$item['controller']}";
-					  				}
-					  				
 					  				$this->menu['tabs'][ $item['tab'] ][ "{$app->directory}_{$moduleKey}" ][ $itemKey ] = "app={$app->directory}&module={$moduleKey}&controller={$item['controller']}" . ( $item['do'] ? "&do={$item['do']}" : '' );
 					  			}
 					  		}
@@ -342,7 +336,20 @@ class _Admin extends \IPS\Dispatcher\Standard
 				}
 			}
 		}
-		
+
+		/* Now set the tab defaults */
+		foreach( $this->menu['tabs'] as $tab => $menu )
+		{
+			if ( !isset( $this->menu['defaults'][ $tab ] ) )
+			{
+				foreach( $menu as $group => $submenu )
+				{
+					$this->menu['defaults'][ $tab ] = array_values($submenu)[0];
+					break;
+				}				
+			}
+		}
+
 		return $this->menu;
 	}