From a065fee3ff094ec737ac90e36d17ce722c994b51 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Mon, 22 Aug 2016 12:02:06 +0200 Subject: [PATCH] fixes registering of theming settings where server return OC_Defaults instead of ThemingDefaults --- apps/theming/lib/Settings/Admin.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/theming/lib/Settings/Admin.php b/apps/theming/lib/Settings/Admin.php index 1f79449e658..d0a9f554084 100644 --- a/apps/theming/lib/Settings/Admin.php +++ b/apps/theming/lib/Settings/Admin.php @@ -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; -- 2.39.5