@@ -31,9 +31,9 @@ discard block |
||
| 31 | 31 | } |
| 32 | 32 | $app = $parts[0]; |
| 33 | 33 | $filename = $parts[array_key_last($parts)]; |
| 34 | - if ($this->appendIfExist($this->serverroot, $resource . '.css') |
|
| 35 | - || $this->appendIfExist($this->serverroot, 'core/' . $resource . '.css') |
|
| 36 | - || $this->appendIfExist($this->serverroot, 'dist/' . $app . '-' . $filename . '.css') |
|
| 34 | + if ($this->appendIfExist($this->serverroot, $resource.'.css') |
|
| 35 | + || $this->appendIfExist($this->serverroot, 'core/'.$resource.'.css') |
|
| 36 | + || $this->appendIfExist($this->serverroot, 'dist/'.$app.'-'.$filename.'.css') |
|
| 37 | 37 | ) { |
| 38 | 38 | return; |
| 39 | 39 | } |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | $app_url = $this->appManager->getAppWebPath($app); |
| 43 | 43 | } catch (AppPathNotFoundException $e) { |
| 44 | 44 | $this->logger->error('Could not find resource {resource} to load', [ |
| 45 | - 'resource' => $resource . '.css', |
|
| 45 | + 'resource' => $resource.'.css', |
|
| 46 | 46 | 'app' => 'cssresourceloader', |
| 47 | 47 | 'exception' => $e, |
| 48 | 48 | ]); |
@@ -54,14 +54,14 @@ discard block |
||
| 54 | 54 | // turned into cwd. |
| 55 | 55 | $app_path = realpath($app_path); |
| 56 | 56 | |
| 57 | - $this->append($app_path, join('/', array_slice($parts, 1)) . '.css', $app_url); |
|
| 57 | + $this->append($app_path, join('/', array_slice($parts, 1)).'.css', $app_url); |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | public function doFindTheme(string $resource): void { |
| 61 | - $theme_dir = 'themes/' . $this->theme . '/'; |
|
| 62 | - $this->appendIfExist($this->serverroot, $theme_dir . 'apps/' . $resource . '.css') |
|
| 63 | - || $this->appendIfExist($this->serverroot, $theme_dir . $resource . '.css') |
|
| 64 | - || $this->appendIfExist($this->serverroot, $theme_dir . 'core/' . $resource . '.css'); |
|
| 61 | + $theme_dir = 'themes/'.$this->theme.'/'; |
|
| 62 | + $this->appendIfExist($this->serverroot, $theme_dir.'apps/'.$resource.'.css') |
|
| 63 | + || $this->appendIfExist($this->serverroot, $theme_dir.$resource.'.css') |
|
| 64 | + || $this->appendIfExist($this->serverroot, $theme_dir.'core/'.$resource.'.css'); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | public function append(string $root, string $file, ?string $webRoot = null, bool $throw = true, bool $scss = false): void { |