Skip to content

[3.0] Stop every page erroring when a member has a gallery avatar #9440

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] Stop every page erroring when a member has a gallery avatar #9440

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
8 changes: 7 additions & 1 deletion Sources/Avatar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,8 +535,14 @@ public function __construct(
// Resolving the canonical path of both the file and the
// directories is important in order to ensure that we
// don't end up navigating outside the avatar dirs.
// A forum at the root of its domain has no path of its
// own to strip. Url::$path is typed with no default, so
// it is not there to be read at all in that case, and
// reading it throws rather than giving back ''.
$board_path = Url::create(Config::$boardurl)->path ?? '';

$abs_path = Sapi::canonicalPath(
preg_replace('~^' . preg_quote(Url::create(Config::$boardurl)->path, '~') . '~u', '', $url->path),
preg_replace('~^' . preg_quote($board_path, '~') . '~u', '', $url->path),
base_dir: Config::$boarddir,
);

Expand Down