sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore(Template): allow styles from `dist` folder 

Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
pull/55432/head
Ferdinand Thiessen 2025-09-30 14:06:31 +07:00
parent 7978ee82a4
commit ab551c4c8a
No known key found for this signature in database
GPG Key ID: 45FAE7268762B400
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/private/Template/CSSResourceLocator.php
Unescape Escape View File

@ -25,13 +25,15 @@ class CSSResourceLocator extends ResourceLocator {
} }
public function doFind(string $resource): void { public function doFind(string $resource): void {
$parts = explode('/', $resource, 2); $parts = explode('/', $resource);
if (count($parts) < 2) { if (count($parts) < 2) {
return; return;
} }
[$app,$subpath] = $parts; $app = $parts[0];
$filename = $parts[array_key_last($parts)];
if ($this->appendIfExist($this->serverroot, $resource . '.css') if ($this->appendIfExist($this->serverroot, $resource . '.css')
|| $this->appendIfExist($this->serverroot, 'core/' . $resource . '.css') || $this->appendIfExist($this->serverroot, 'core/' . $resource . '.css')
|| $this->appendIfExist($this->serverroot, 'dist/' . $app . '-' . $filename . '.css')
) { ) {
return; return;
} }
@ -40,7 +42,7 @@ class CSSResourceLocator extends ResourceLocator {
$app_url = $this->appManager->getAppWebPath($app); $app_url = $this->appManager->getAppWebPath($app);
} catch (AppPathNotFoundException $e) { } catch (AppPathNotFoundException $e) {
$this->logger->error('Could not find resource {resource} to load', [ $this->logger->error('Could not find resource {resource} to load', [
'resource' => $app . '/' . $subpath . '.css', 'resource' => $resource . '.css',
'app' => 'cssresourceloader', 'app' => 'cssresourceloader',
'exception' => $e, 'exception' => $e,
]); ]);
@ -52,7 +54,7 @@ class CSSResourceLocator extends ResourceLocator {
// turned into cwd. // turned into cwd.
$app_path = realpath($app_path); $app_path = realpath($app_path);
$this->append($app_path, $subpath . '.css', $app_url); $this->append($app_path, join('/', array_slice($parts, 1)) . '.css', $app_url);
} }
public function doFindTheme(string $resource): void { public function doFindTheme(string $resource): void {