[stable13] theming: handle not being in the serverroot#8554
Merged
juliusknorr merged 1 commit intonextcloud:stable13from Feb 27, 2018
Merged
Conversation
Currently, the theming app assumes it's in the serverroot. However, with Nextcloud's flexibility regarding configurable app paths, this is not a safe assumption to make. If it happens to be an incorrect assumption, the theming app fails to work. Instead of relying on the serverroot, just use the path from the AppManager and utilize relative paths for assets from there. Fix nextcloud#8462 Signed-off-by: Kyle Fazzari <[email protected]>
skjnldsv
approved these changes
Feb 27, 2018
Member
skjnldsv
left a comment
skjnldsv
left a comment
There was a problem hiding this comment.
Test restarted, let's wait for results.
Codecov Report
@@ Coverage Diff @@
## stable13 #8554 +/- ##
==============================================
+ Coverage 51.22% 51.22% +<.01%
Complexity 24991 24991
==============================================
Files 1608 1608
Lines 95117 95119 +2
Branches 1376 1376
==============================================
+ Hits 48724 48726 +2
Misses 46393 46393
|
juliusknorr
approved these changes
Feb 27, 2018
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.
This PR is a backport of #8463 for v13.
Currently, the theming app assumes it's in the serverroot. However, with Nextcloud's flexibility regarding configurable app paths, this is not a safe assumption to make. If it happens to be an incorrect assumption, the theming app fails to work.
Instead of relying on the serverroot, just use the path from the AppManager and utilize relative paths for assets from there.