Skip to content

[stable30] fix(JSResourceLocator) fix incorrect parameter being used #52523

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.

Sign up for GitHub

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

Merged
skjnldsv merged 1 commit into from
Apr 30, 2025
Merged

[stable30] fix(JSResourceLocator) fix incorrect parameter being used #52523

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix(JSResourceLocator): fix incorrect parameter being used 
Signed-off-by: Git'Fellow <[email protected]>
  • Loading branch information
@solracsf
solracsf committed Apr 29, 2025
commit b751eea309529879497348b68e7a83016566e19e
2 changes: 1 addition & 1 deletion lib/private/Template/JSResourceLocator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public function doFind($script) {
|| $this->appendScriptIfExist($this->serverroot, "dist/$app-$scriptName")
|| $this->appendScriptIfExist($appRoot, $script, $appWebRoot)
|| $this->cacheAndAppendCombineJsonIfExist($this->serverroot, $script.'.json')
|| $this->cacheAndAppendCombineJsonIfExist($appRoot, $script.'.json', $appWebRoot)
|| $this->cacheAndAppendCombineJsonIfExist($appRoot, $script.'.json', $app)
|| $this->appendScriptIfExist($this->serverroot, $theme_dir.'core/'.$script)
|| $this->appendScriptIfExist($this->serverroot, 'core/'.$script)
|| (strpos($scriptName, '/') === -1 && ($this->appendScriptIfExist($this->serverroot, $theme_dir."dist/core-$scriptName")
Expand Down
Loading