upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-14 13:38:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge pull request #29683 from nextcloud/bugfix/29676/fix-theming-dependencies

Browse source 
Fix core depending on theming app
This commit is contained in:
Carl Schwan 2021-11-16 11:33:08 +01:00 committed by GitHub
commit 6ea81dd2cb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/private/Template/SCSSCacher.php
View file

@ -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) {