Version 5.0.0 beta 10

applications/core/modules/front/system/alerts.php

@@ -58,7 +58,7 @@ class alerts extends Controller
 		{
 			$alert = Alert::load( Request::i()->id );
 
-			if( $alert->reply == 2 and Member::loggedIn()->member_id and Member::loggedIn()->canUseMessenger() )
+			if( $alert->reply == Alert::REPLY_REQUIRED and Member::loggedIn()->member_id and Member::loggedIn()->canUseMessenger() )
 			{
 				Output::i()->error( 'alert_cant_dismiss', '3C428/1', 403, '' );
 			}

applications/core/modules/front/system/register.php

@@ -165,7 +165,6 @@ class register extends Controller
 		if ( Login::registrationType() == 'normal' )
 		{
 			$form = $this->_registrationForm( $postBeforeRegister );
-			$form->class = 'ipsForm_fullWidth';
 
 			Output::i()->title	= Member::loggedIn()->language()->addToStack('registration');
 
@@ -286,6 +285,11 @@ class register extends Controller
 	{
 		$form = static::buildRegistrationForm( $postBeforeRegister );
 
+		if( Login::registrationType() == 'normal' )
+		{
+			$form->class = 'ipsForm_fullWidth';
+		}
+
 		/* Handle submissions */
 		if ( $values = $form->values() )
 		{

applications/core/modules/front/system/settings.php

@@ -23,6 +23,7 @@ use IPS\DateTime;
 use IPS\Db;
 use IPS\Dispatcher\Controller;
 use IPS\Email;
+use IPS\Extensions\AccountSettingsAbstract;
 use IPS\Extensions\SSOAbstract;
 use IPS\File;
 use IPS\GeoLocation;
@@ -122,7 +123,9 @@ class settings extends Controller
 		{
 			foreach( Application::allExtensions( 'core', 'AccountSettings', TRUE, 'core' ) as $ext )
 			{
-				if( $ext->getTab() == $area )
+				/* @var AccountSettingsAbstract $ext */
+				$tabName = $ext->getTab();
+				if( $tabName == $area )
 				{
 					if( isset( Request::i()->action ) AND method_exists( $ext, Request::i()->action ) )
 					{
@@ -136,6 +139,12 @@ class settings extends Controller
 				}
 			}
 		}
+
+		/* If we have no output, then we couldn't find the tab */
+		if( !isset( $output ) )
+		{
+			Output::i()->error( 'node_error', '2C122/2', 404 );
+		}
 		
 		/* Display */
 		Output::i()->title = Member::loggedIn()->language()->addToStack('settings');