Version 5.0.0 release

This commit is contained in:
Neo committed 2025-12-19 18:37:58 -08:00
1 parent 90e8c7e903
commit a3a4a9ccbd
651 files changed
+7275 -9481

No files matched your search

+8 -15
View File
@@ -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;
}
}