Version 4.6.0

system/Dispatcher/Admin.php

@@ -56,9 +56,6 @@ class _Admin extends \IPS\Dispatcher\Standard
 	{
 		\IPS\Output::i()->sidebar['appmenu'] = '';
 
-		/* Disable sending of referrer to third party sites from AdminCP */
-		\IPS\Output::i()->sendHeader( "Referrer-Policy: origin-when-cross-origin" );
-		
 		/* Sync stuff when in developer mode */
 		if ( \IPS\IN_DEV )
 		{
@@ -176,7 +173,13 @@ class _Admin extends \IPS\Dispatcher\Standard
 		{
 			\IPS\Session::i()->csrfCheck();
 		}
-		
+
+		\IPS\Db::i()->readWriteSeparation = FALSE;
+		if ( isset( $this->classname::$allowRWSeparation ) and $this->classname::$allowRWSeparation )
+		{
+			\IPS\Db::i()->readWriteSeparation = TRUE;
+		}
+
 		/* If we are in recovery mode, but not actually doing the recovery process, or logging in, then we need them to remove the constant */
 		if ( \IPS\RECOVERY_MODE === TRUE AND !\in_array( $this->controller, array( 'recovery', 'login' ) ) )
 		{
@@ -413,6 +416,16 @@ class _Admin extends \IPS\Dispatcher\Standard
 			$_apps	= array_keys( $acpTabOrder );
 			uksort( $this->menu['tabs'], function($a, $b) use ( $_apps )
 			{
+				if( !\in_array( $a, $_apps ) )
+				{
+					return 1;
+				}
+
+				if( !\in_array( $b, $_apps ) )
+				{
+					return -1;
+				}
+
 				return array_search( $a, $_apps ) - array_search( $b, $_apps );
 			} );
 			
@@ -424,6 +437,16 @@ class _Admin extends \IPS\Dispatcher\Standard
 					{
 						uksort( $this->menu['tabs'][ $app ], function($a, $b) use ( $submenu )
 						{
+							if( !\in_array( $a, $submenu ) )
+							{
+								return 1;
+							}
+
+							if( !\in_array( $b, $submenu ) )
+							{
+								return -1;
+							}
+
 							return array_search( $a, $submenu ) - array_search( $b, $submenu );
 						} );
 					}