Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rica carv missing avatar check reopens pull #5241 #5311

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Rica carv missing avatar check reopens pull #5241 #5311

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
65fc765
Aditional check for external missing avatars
rica-carv Apr 27, 2024
cc41528
Add files via upload
rica-carv Apr 27, 2024
bcaad61
Update e_parse_class.php
rica-carv May 11, 2024
591bab9
Merge branch 'e107inc:master' into master
rica-carv Jul 5, 2024
9128256
Aditional change to make default avatar image render
rica-carv Jul 5, 2024
9c156d4
Add files via upload
rica-carv Aug 3, 2024
c8483ad
Merge pull request #56 from rica-carv/rica-carv-patch-texttruncate
rica-carv Aug 3, 2024
3de1ea4
Revert "Add files via upload"
rica-carv Aug 3, 2024
6a7eeb0
Merge pull request #57 from rica-carv/revert-56-rica-carv-patch-textt…
rica-carv Aug 3, 2024
253ace4
Merge pull request #59 from e107inc/master
rica-carv Aug 4, 2024
88e7261
Delete e107_handlers/e_parse_class.php
rica-carv Aug 4, 2024
9fa6f1a
Add files via upload
rica-carv Aug 4, 2024
5b7bc35
Update e_parse_class.php
rica-carv Aug 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions e107_handlers/e_parse_class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4308,14 +4308,22 @@ public function toAvatar($userData = null, $options = array())
$image = (!empty($userData['user_image'])) ? varset($userData['user_image']) : null;

$genericFile = e_IMAGE . 'generic/blank_avatar.jpg';
$genericImg = $tp->thumbUrl($genericFile, 'w=' . $width . '&h=' . $height, true, $full);
$genericImg = $tp->thumbUrl($genericFile, 'w=' . $width . '&h=' . $height, false, $full);

if (!empty($image))
{

if (strpos($image, '://') !== false) // Remote Image
{
$url = $image;
if (@fopen($image, 'r'))
{
$url = $image;
}
else
{
$file = $genericFile;
$url = $genericImg;
}
}
elseif (strpos($image, '-upload-') === 0)
{
Expand Down
Loading