Shortcut to avoid file system setup when generating the logo URL#23889
Merged
MorrisJobke merged 1 commit intomasterfrom Nov 9, 2020
Merged
Shortcut to avoid file system setup when generating the logo URL#23889MorrisJobke merged 1 commit intomasterfrom
MorrisJobke merged 1 commit intomasterfrom
Conversation
MorrisJobke
commented
Nov 4, 2020
Member
Author
|
/backport to stable20 |
juliusknorr
approved these changes
Nov 4, 2020
Member
|
CI says no |
MorrisJobke
force-pushed
the
fix/noid/shortcut-to-avoid-filesystem-setup
branch
from
dd53324 to
7531cc5
Compare
Member
Author
CI actually checked for the file access 🙈 I removed that and it runs fine locally now. |
Member
Author
|
Ready for final review. Best to be reviewed in whitespace cleaned mode: https://github.com/nextcloud/server/pull/23889/files?w=1 |
rullzer
reviewed
Nov 6, 2020
| // explanation: if an SVG is requested and the app config value for logoMime is set then the logo is there. | ||
| // otherwise we need to check it and maybe also generate a PNG from the SVG (that's done in getImage() which | ||
| // needs to be called then) | ||
| if ($useSvg === true && $logo !== false) { |
Member
There was a problem hiding this comment.
So this only works if your logo is an SVG logo?
Member
Author
There was a problem hiding this comment.
yes, because in the other case it also tries to create the file on the fly. See the code in getImage. But for the capabilities SVG is used and that was the main driver for this here.
rullzer
approved these changes
Nov 9, 2020
Member
|
php-cs is not happy |
If an SVG is requested and the app config value for logoMime is set then the logo is there. Otherwise we need to check it and maybe also generate a PNG from the SVG (that's done in getImage() which needs to be called then). Signed-off-by: Morris Jobke <hey@morrisjobke.de>
MorrisJobke
force-pushed
the
fix/noid/shortcut-to-avoid-filesystem-setup
branch
from
7531cc5 to
c7ff0c7
Compare
Member
Author
Fixed. |
MorrisJobke
added
4. to release
|
🤖 beep boop beep 🤖 Here are the logs for the failed build: Status of 35246: failureintegration-comments-search
Show full log |
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
3 participants
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.
If an SVG is requested and the app config value for logoMime is set then the logo is there. Otherwise we need to check it and maybe also generate a PNG from the SVG (that's done in getImage() which needs to be called then).