fix: use absolute URL for logo in email #2628
Merged
Conversation
This file contains 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
NGPixel
requested changes
Nov 1, 2020
server/core/mail.js
Outdated
| @@ -56,7 +56,7 @@ module.exports = { | |||
| subject: `${opts.subject} - ${WIKI.config.title}`, | |||
| text: opts.text, | |||
| html: _.get(this.templates, opts.template)({ | |||
| logo: WIKI.config.logoUrl, | |||
| logo: WIKI.config.host + WIKI.config.logoUrl, | |||
There was a problem hiding this comment.
logoUrl can also be an absolute URL. There should be a check to see whether logoUrl starts with http and only prefix the host if not.
|
Added a ternary that conditionally prepends the host URL. Tested both cases on my installation. |
NGPixel
approved these changes
Nov 11, 2020
jionggyu
pushed a commit
to jionggyu/wiki-2.5.302-patch
that referenced
this pull request
Jul 9, 2024
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.
Prepends the wiki site URL to the logo path used when sending email from the wiki.
Before:
<img src="/uploads/logo.png"After:
<img src="http://wiki.site.url/uploads/logo.png