Closed
Conversation
kesselb
force-pushed
the
bugfix/fallback-for-text-plain-does-not-work
branch
from
dfa5899 to
f0e5b66
Compare
juliusknorr
reviewed
Jun 25, 2019
lib/private/URLGenerator.php
Outdated
| && file_exists(\OC::$SERVERROOT . "/themes/$theme/core/img/$basename.png")) { | ||
| $path = \OC::$WEBROOT . "/themes/$theme/core/img/$basename.png"; | ||
| } elseif($themingEnabled && $themingImagePath) { | ||
| } elseif($themingEnabled && $themingImagePath && file_exists(\OC::$WEBROOT . $themingImagePath)) { |
Member
There was a problem hiding this comment.
This will never be true since the $themingImagePath is already an URL to the endpoint of the teming app, so file_exists will always fail.
Contributor
Author
There was a problem hiding this comment.
Indeed. I mixed-up \OC::$SERVERROOT and \OC::$WEBROOT.
Member
|
@kesselb Is this also an issue in the files app or just with activity? |
Signed-off-by: Daniel Kesselberg <[email protected]>
kesselb
force-pushed
the
bugfix/fallback-for-text-plain-does-not-work
branch
from
f0e5b66 to
f37264f
Compare
Contributor
Author
Only activity. We are running into this case if
|
Member
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
2 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.
Icon
apps/theming/img/core/filetypes/text-plain.svgdoes not exist. There should be a fallback toplain.svgbutimagePathdoes not check if the icon exists. I'm not sure about this change because this icon resolve logic is rather complex and there might be something broken on my setup ...