aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2023-05-15 09:17:30 +0200
committerGitHub <noreply@github.com>2023-05-15 09:17:30 +0200
commit25f3678e2428549f72c43a9bc72c0a5741f7c210 (patch)
tree581808e586402bba704c59619d911e7e27119ef5
parent2a4af880c14c5de6b1e0e2872143472435f8f883 (diff)
parent0ebb00d01dfdbcae670b1253ded83031fdb684bb (diff)
downloadnextcloud-server-25f3678e2428549f72c43a9bc72c0a5741f7c210.tar.gz
nextcloud-server-25f3678e2428549f72c43a9bc72c0a5741f7c210.zip
Merge pull request #38237 from nextcloud/bugfix/noid/no-combine-l10n
-rw-r--r--lib/private/Template/JSResourceLocator.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/Template/JSResourceLocator.php b/lib/private/Template/JSResourceLocator.php
index 61611c69b0f..a84ef8968b9 100644
--- a/lib/private/Template/JSResourceLocator.php
+++ b/lib/private/Template/JSResourceLocator.php
@@ -100,7 +100,7 @@ class JSResourceLocator extends ResourceLocator {
$app_path = realpath($app_path);
// check combined files
- if ($this->cacheAndAppendCombineJsonIfExist($app_path, $script.'.json', $app)) {
+ if (!str_starts_with($script, 'l10n/') && $this->cacheAndAppendCombineJsonIfExist($app_path, $script.'.json', $app)) {
return;
}