diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2016-08-22 13:20:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-22 13:20:57 +0200 |
| commit | 94992772b27b1f9c87d82a385932d3d93e45c750 (patch) | |
| tree | 10ab7639dedf69ee5127ad92e3eb6ddd75088c34 | |
| parent | 8b117ee0d7a85287b255d36635dc97a15621b0a2 (diff) | |
| parent | a065fee3ff094ec737ac90e36d17ce722c994b51 (diff) | |
| download | nextcloud-server-94992772b27b1f9c87d82a385932d3d93e45c750.tar.gz nextcloud-server-94992772b27b1f9c87d82a385932d3d93e45c750.zip | |
Merge pull request #1006 from nextcloud/fix_theming_admin_di
fixes registering of theming settings where server return OC_Defaults…
| -rw-r--r-- | apps/theming/lib/Settings/Admin.php | 5 |
1 files 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; |