Version 5.0.0 beta 9

system/Login/Handler/OAuth1/Twitter.php

@@ -86,7 +86,7 @@ class Twitter extends OAuth1
 	 */
 	public function buttonColor(): string
 	{
-		return '#1d9bf0';
+		return '#000000';
 	}
 	
 	/**
@@ -127,7 +127,7 @@ class Twitter extends OAuth1
 	 */
 	public function logoForDeviceInformation(): Url|string|null
 	{
-		return Theme::i()->resource( 'logos/login/Twitter.png', 'core', 'interface' );
+		return Theme::i()->resource( 'logos/login/X.png', 'core', 'interface' );
 	}
 	
 	/**

system/Login/Login.php

@@ -25,6 +25,7 @@ use IPS\Login\Success;
 use IPS\Member\Device;
 use IPS\Session\Front;
 use OutOfRangeException;
+use UnderflowException;
 use function count;
 use function defined;
 use function function_exists;
@@ -176,7 +177,7 @@ class Login
 				or ( $this->type === static::LOGIN_UCP and $method->front )
 				or ( $this->type === static::LOGIN_ACP and $method->acp )
 				or ( $this->type === static::LOGIN_REGISTRATION_FORM and $method->register )
-				or ( $this->type === static::LOGIN_REAUTHENTICATE and $method->canProcess( $this->reauthenticateAs ) and !( $method instanceof Handler ) )
+				or ( $this->type === static::LOGIN_REAUTHENTICATE and $method->canProcess( $this->reauthenticateAs ) and $method instanceof Handler )
 			) {
 				$methods[ $k ] = $method;
 			}
@@ -536,7 +537,16 @@ class Login
 			$url = Url::internal( "app=core&module=system&controller=lostpass", "front", "lostpassword" );
 			return Member::loggedIn()->language()->addToStack( 'member_email_exists', FALSE, array( 'sprintf' => array( (string) $url ) ) );
 		}
-		
+
+		/* Check if someone requested to change to this email */
+		try
+		{
+			$test = Db::i()->select( '*', 'core_validating', [ 'email_chg=? and new_email=?', 1, $email ] )->first();
+			$url = Url::internal( "app=core&module=system&controller=lostpass", "front", "lostpassword" );
+			return Member::loggedIn()->language()->addToStack( 'member_email_exists', FALSE, array( 'sprintf' => array( (string) $url ) ) );
+		}
+		catch( UnderflowException ){}
+
 		/* Check each handler */
 		foreach( static::methods() as $k => $handler )
 		{