Version 5.0.0 release

system/Member/History.php

@@ -92,8 +92,14 @@ class History extends \IPS\Helpers\Table\Db
 		$options	= array();
 		$extensions	= static::$extensions;
 
-		foreach( $extensions as $extension )
+		foreach( $extensions as $app => $extension )
 		{
+			if( $extension === null )
+			{
+				unset( $extensions[ $app ] );
+				continue;
+			}
+
 			foreach( $extension->getTypes() as $type )
 			{
 				if ( $type === 'oauth' and Db::i()->select( 'COUNT(*)', 'core_oauth_clients', array( Db::i()->findInSet( 'oauth_grant_types', array( 'authorization_code', 'implicit', 'password' ) ) ) )->first() === 1 )

system/Member/Member.php

@@ -1867,14 +1867,6 @@ class Member extends ActiveRecord
 				}
 				catch ( InvalidArgumentException $e ) { }
 			}
-			/* Letter photos are enabled and we do not have a photo set, but only if this isn't for email */
-			elseif( Settings::i()->letter_photos == 'letters' AND $email === FALSE and isset( $memberData['name'] ) )
-			{
-				if( $photo = static::generateLetterPhoto($memberData) )
-				{
-					$photoUrl = $photo;
-				}
-			}
 			/* Other - This allows an app (such as Gallery) to set the pp_photo_type to a storage container to support custom images without duplicating them */
 			elseif( $memberData['pp_photo_type'] and $memberData['pp_photo_type'] != 'none' and mb_strpos( $memberData['pp_photo_type'], '_' ) !== FALSE )
 			{
@@ -1882,13 +1874,14 @@ class Member extends ActiveRecord
 				{
 					$photoUrl = File::get( $memberData['pp_photo_type'], $memberData['pp_main_photo'] )->url;
 				}
-				catch ( InvalidArgumentException $e )
-				{				
-					/* If there was an exception, clear these values out - most likely the image or storage container is no longer valid */
-					$member = Member::load( $memberData['member_id'] );
-					$member->pp_photo_type	= NULL;
-					$member->pp_main_photo	= NULL;
-					$member->save();
+				catch ( InvalidArgumentException $e ){}
+			}
+			/* Letter photos are enabled, and we do not have a photo set, but only if this isn't for email */
+			elseif( Settings::i()->letter_photos == 'letters' AND $email === FALSE and isset( $memberData['name'] ) )
+			{
+				if( $photo = static::generateLetterPhoto($memberData) )
+				{
+					$photoUrl = $photo;
 				}
 			}
 

system/Member/Team.php

@@ -57,7 +57,7 @@ class Team extends ActiveRecord
 	 * @brief	[ActiveRecord] Caches
 	 * @note	Defined cache keys will be cleared automatically as needed
 	 */
-	protected array $caches = array( 'teams' );
+	protected array $caches = array( 'teams', 'assignmentOptions' );
 
 	/**
 	 * @return array