[2.x] fix: resolve email logo URL via flarum-assets disk#4640
Merged
Conversation
The HTML email layout built the logo src as
$url->to('forum')->base() . '/assets/' . $logo_path. On installs
serving assets from a remote bucket or CDN, the actual file is at
the disk's URL, not under the forum base — every email rendered a
broken logo image.
Resolve the logo URL via the flarum-assets disk in MailServiceProvider
and share it as a precomputed $logoUrl view variable. Same resolver
ForumResource::getLogoUrl() already uses for the frontend, so local
installs (where the disk URL coincides with /assets/...) are unchanged.
Fixes #4604
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
The HTML email layout built the logo
<img src>as:On installs serving assets from a remote bucket or CDN, the actual logo file lives at the
flarum-assetsdisk's resolved URL — not underforum-base/assets/. Every email those installs rendered showed a broken logo.Resolve the logo URL via the same
flarum-assetsdisk thatForumResource::getLogoUrl()uses for the frontend, and share it to email views as a precomputed$logoUrl.Fixes #4604
Changes
framework/core/src/Mail/MailServiceProvider.php—boot()now resolveslogo_pathagainst theflarum-assetsdisk and shares the result aslogoUrlto all views (computed once per request boot, cheap).framework/core/views/email/html.blade.php— read the precomputed$logoUrlinstead of the broken concatenation; no@injectadded.Compatibility
flarum-assetsdisk'surl()returnshttps://forum.example.com/assets/<path>— same URL the old concatenation produced. No observable change.$logoUrlto an email render via->with('logoUrl', ...)still win — Laravel's localwith()overrides globalshare().Test plan
Notes
<img src>attribute, which is heavyweight relative to the size of this change. The fix mirrors a pattern already exercised everywhere else in core that resolves asset URLs.