diff options
| author | Carl Schwan <carl@carlschwan.eu> | 2021-11-16 11:33:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-16 11:33:08 +0100 |
| commit | 6ea81dd2cbfb8a9013895d07fb4df17b8df27348 (patch) | |
| tree | c92c2cab39d63b8c5dc03bbb0e8d09f177caf94d /lib | |
| parent | 287e048d4090917988d02e091fe0aa995d66f597 (diff) | |
| parent | 9189bc21fb9940b949dad29578b170906461c36f (diff) | |
| download | nextcloud-server-6ea81dd2cbfb8a9013895d07fb4df17b8df27348.tar.gz nextcloud-server-6ea81dd2cbfb8a9013895d07fb4df17b8df27348.zip | |
Merge pull request #29683 from nextcloud/bugfix/29676/fix-theming-dependencies
Fix core depending on theming app
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Template/SCSSCacher.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php index c1bd556de60..0543427f997 100644 --- a/lib/private/Template/SCSSCacher.php +++ b/lib/private/Template/SCSSCacher.php @@ -32,7 +32,6 @@ namespace OC\Template; use OC\AppConfig; use OC\Files\AppData\Factory; use OC\Memcache\NullCache; -use OCA\Theming\ThemingDefaults; use OCP\AppFramework\Utility\ITimeFactory; use OCP\Files\IAppData; use OCP\Files\NotFoundException; @@ -63,7 +62,7 @@ class SCSSCacher { /** @var IConfig */ protected $config; - /** @var ThemingDefaults */ + /** @var \OC_Defaults */ private $defaults; /** @var string */ @@ -97,7 +96,7 @@ class SCSSCacher { * @param Factory $appDataFactory * @param IURLGenerator $urlGenerator * @param IConfig $config - * @param ThemingDefaults $defaults + * @param \OC_Defaults $defaults * @param string $serverRoot * @param ICacheFactory $cacheFactory * @param IconsCacher $iconsCacher @@ -107,7 +106,7 @@ class SCSSCacher { Factory $appDataFactory, IURLGenerator $urlGenerator, IConfig $config, - ThemingDefaults $defaults, + \OC_Defaults $defaults, $serverRoot, ICacheFactory $cacheFactory, IconsCacher $iconsCacher, @@ -407,7 +406,7 @@ class SCSSCacher { } /** - * @return string SCSS code for variables from ThemingDefaults + * @return string SCSS code for variables from OC_Defaults */ private function getInjectedVariables(string $cache = ''): string { if ($this->injectedVariables !== null) { |