fix(JSResourceLocator): Consider configured app roots for files #43917
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
Signed-off-by: Ferdinand Thiessen <[email protected]>
susnux
requested review from
juliusknorr,
artonge,
a team,
nfebe and
sorbaugh
and removed request for
a team
susnux
commented
Feb 29, 2024
| $found += $this->appendScriptIfExist($this->serverroot, $theme_dir.$dirName.'/'.$script); | ||
| } | ||
| $found += $this->appendScriptIfExist($appRoot, $script, $appWebRoot); | ||
| $found += $this->appendScriptIfExist($this->serverroot, $theme_dir.'apps/'.$script); |
There was a problem hiding this comment.
This was a bug previously, because for all other scripts we always looked into themes/{themename}/apps/{appname}.
The mentioned PR broke this for translations that were now only searched in `themes/{themename}/{appswebroot}/{appname}.
|
/backport to stable28 |
|
indeed - this seems to fix the issue |
skjnldsv
added
4. to release
skjnldsv
approved these changes
Mar 6, 2024
sorbaugh
approved these changes
Mar 6, 2024
Merged
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.
Summary
#40898 introduced an issue when loading scripts from other app roots,
the problem is that the app roots are manually queried and then tried, but if the apps directory path is not a child of the server root the webroot could not be guessed.
The solution I propose is also simplifying the code I think:
Instead of looking into app roots after all other queries we load the app path and app webroot for the requested script in the beginning.
Then we try all paths like before, except for
apps/...we now use{apppath}/...directly as this also works for the nativeappsroot.Here we also pass the matching app webroot so we do not need to fallback to the ResourceLocator guessing function.
Checklist