mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1010 from nextcloud/backport-1006 

[stable10] fixes registering of theming settings where server return OC_Defaults
This commit is contained in:
Roeland Jago Douma 2016-08-22 15:08:56 +02:00 committed by GitHub
parent cc80df9e8e 0f3513afff
commit e9e54f057a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/theming/lib/Settings/Admin.php
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;