-
-
Notifications
You must be signed in to change notification settings - Fork 4.7k
Shortcut to avoid file system setup when generating the logo URL #23889
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.
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
Shortcut to avoid file system setup when generating the logo URL #23889
Conversation
|
/backport to stable20 |
|
CI says no |
dd53324 to
7531cc5
Compare
CI actually checked for the file access 🙈 I removed that and it runs fine locally now. |
|
Ready for final review. Best to be reviewed in whitespace cleaned mode: https://github.com/nextcloud/server/pull/23889/files?w=1 |
| // 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) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So this only works if your logo is an SVG logo?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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.
|
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 <[email protected]>
7531cc5 to
c7ff0c7
Compare
Fixed. |
|
🤖 beep boop beep 🤖 Here are the logs for the failed build: Status of 35246: failureintegration-comments-search
Show full log |
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).