Skip to content

[3.0] Recognise a gallery avatar as a file name, not a url #9442

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

Open
albertlast wants to merge 1 commit into
base: release-3.0
Choose a base branch
from
Open

[3.0] Recognise a gallery avatar as a file name, not a url #9442

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions Sources/Avatar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,20 @@ public function __construct(
$url = new Url($this->original_url, true)->proxied();
}

// An avatar picked out of the gallery is stored as a path relative to
// the avatars directory rather than as a URL, so anything with no
// scheme to it is a file name and not somewhere to fetch from. Saying
// so here means the search below finds it on its second attempt instead
// of guessing from the URL path, which only works out for a forum that
// is not at the root of its domain.
if (empty($this->filename) && !$url->isValid() && !str_contains((string) $url, '://')) {
$name = ltrim(strtr((string) $url, '\\', '/'), '/');

if ($name !== '' && !str_contains($name, ':')) {
$this->filename = $name;
}
}

// If we still don't have a valid URL, try to figure it out.
while (!$url->isValid()) {
$attempt ??= 0;
Expand Down