Merge pull request #1006 from nextcloud/fix_theming_admin_di

fixes registering of theming settings where server return OC_Defaults…
This commit is contained in:
blizzz 2016-08-22 13:20:57 +02:00 committed by GitHub
commit 94992772b2

View file

@ -29,20 +29,21 @@ use OCP\IConfig;
use OCP\IL10N;
use OCP\IURLGenerator;
use OCP\Settings\ISettings;
use \OC_Defaults;
class Admin implements ISettings {
/** @var IConfig */
private $config;
/** @var IL10N */
private $l;
/** @var ThemingDefaults */
/** @var ThemingDefaults|OC_Defaults */
private $themingDefaults;
/** @var IURLGenerator */
private $urlGenerator;
public function __construct(IConfig $config,
IL10N $l,
ThemingDefaults $themingDefaults,
OC_Defaults $themingDefaults,
IURLGenerator $urlGenerator) {
$this->config = $config;
$this->l = $l;