Version 4.7.13

system/Dispatcher/Admin.php

@@ -494,13 +494,18 @@ class _Admin extends \IPS\Dispatcher\Standard
 		{
 			return $this->acpTabOrder;
 		}
-			
-		if ( isset( \IPS\Request::i()->cookie['acpTabs'] ) )
+		
+		if ( isset( \IPS\Request::i()->cookie['acpTabs'] ) AND !\IPS\Settings::i()->acp_menu_cookie_rebuild )
 		{ 
 			$this->acpTabOrder = json_decode( \IPS\Request::i()->cookie['acpTabs'], TRUE );
 		}
 		else
 		{
+			if ( \IPS\Settings::i()->acp_menu_cookie_rebuild )
+			{
+				\IPS\Settings::i()->changeValues( array( 'acp_menu_cookie_rebuild' => 0 ) );
+			}
+			
 			try
 			{
 				$this->acpTabOrder = json_decode( \IPS\Db::i()->select( 'data', 'core_acp_tab_order', array( 'id=?', \IPS\Member::loggedIn()->member_id ) )->first(), TRUE );

system/Dispatcher/Api.php

@@ -271,7 +271,7 @@ class _Api extends \IPS\Dispatcher
 	/**
 	 * Set Language
 	 *
-	 * @return	void
+	 * @return	Lang
 	 */
 	public function _setLanguage()
 	{
@@ -285,6 +285,8 @@ class _Api extends \IPS\Dispatcher
 			{
 				$this->language = \IPS\Lang::load( \IPS\Lang::defaultLanguage() );
 			}
+
+			return $this->language;
 		}
 		catch ( \OutOfRangeException $e )
 		{

system/Dispatcher/Front.php

@@ -680,6 +680,7 @@ Disallow: {$path}startTopic/
 Disallow: {$path}discover/unread/
 Disallow: {$path}markallread/
 Disallow: {$path}staff/
+Disallow: {$path}cookie/
 Disallow: {$path}online/
 Disallow: {$path}discover/
 Disallow: {$path}leaderboard/
@@ -823,7 +824,7 @@ FILE;
 		}
 
 		/* Don't get in the way of the ModCP, registering, logging in, etc */
-		$ignoreControllers = [ 'modcp', 'register', 'login', 'redirect' ];
+		$ignoreControllers = [ 'modcp', 'register', 'login', 'redirect', 'cookie' ];
 		if( !\IPS\Request::i()->isAjax() and !\in_array( $this->controller, $ignoreControllers ) AND $alert = \IPS\core\Alerts\Alert::getNextAlertForMember( \IPS\Member::loggedIn() ) )
 		{
 			$alert->viewed( \IPS\Member::loggedIn() );

system/Dispatcher/Standard.php

@@ -272,7 +272,7 @@ abstract class _Standard extends \IPS\Dispatcher
 			}
 
 			/* VLE */
-			if ( isset( \IPS\Request::i()->cookie['vle_editor'] ) and \IPS\Request::i()->cookie['vle_editor'] )
+			if ( \IPS\Lang::vleActive() )
 			{
 				\IPS\Output::i()->cssFiles = array_merge( \IPS\Output::i()->cssFiles, \IPS\Theme::i()->css( 'customization/visuallanguage.css', 'core', 'admin' ) );
 				\IPS\Output::i()->jsFiles = array_merge( \IPS\Output::i()->jsFiles, \IPS\Output::i()->js( 'global_customization.js', 'core', 'global' ) );