Use the correct root to determinate the webroot for the resource #22550
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
Since all the compiled routes are based on the server webroot, we have to use this, independent from which app this belongs to. Signed-off-by: Joas Schilling <coding@schilljs.com>
nickvergessen
added
3. to review
nickvergessen
commented
Sep 2, 2020
| @@ -109,7 +109,7 @@ protected function cacheAndAppendScssIfExist($root, $file, $app = 'core') { | |||
| if (is_file($root.'/'.$file)) { | |||
| if ($this->scssCacher !== null) { | |||
| if ($this->scssCacher->process($root, $file, $app)) { | |||
| $this->append($root, $this->scssCacher->getCachedSCSS($app, $file), \OC::$WEBROOT, true, true); | |||
| $this->append($this->serverroot, $this->scssCacher->getCachedSCSS($app, $file), \OC::$WEBROOT, true, true); | |||
There was a problem hiding this comment.
Before this tried to load /home/nickv/Nextcloud/20/appsbabies/spreed index.php/css/spreed/2359-7462-unified-search.css?v=d0784d96eefd0edc6bea0c967d17b4ea which is wrong, because the index.php is located in the serverroot, not the apps webroot. It worked for most of us because it fell back to '' logged an error and loaded the file anyway. It only broke visually when nextcloud had a non-empty webroot, e.g. (https://example.tld/nextcloud)
rullzer
approved these changes
Sep 3, 2020
Merged
nickvergessen
deleted the
bugfix/13556/use-correct-root-when-compiling-scss
branch
|
/backport to stable19 |
|
/backport to stable18 |
|
The backport to stable18 failed. Please do this backport manually. |
|
18 backport in #22585 |
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.
Since all the compiled routes are based on the server webroot,
we have to use this, independent from which app this belongs to.
Fix #13556