summaryrefslogtreecommitdiffstats
path: root/apps/theming/lib
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2017-04-28 18:08:51 +0200
committerMorris Jobke <hey@morrisjobke.de>2017-04-29 00:40:15 -0300
commitb436e43d686053fbb2ca5fa56c3f256775ba0f18 (patch)
tree882ab252da138bea27cf41e53760f7bbe9a87502 /apps/theming/lib
parent6b8341ce4b6cac3f9a50d188753d95283573b72d (diff)
downloadnextcloud-server-b436e43d686053fbb2ca5fa56c3f256775ba0f18.tar.gz
nextcloud-server-b436e43d686053fbb2ca5fa56c3f256775ba0f18.zip
Make sure that ThemingDefaults uses the correct default values from \OC_Defaults
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'apps/theming/lib')
-rw-r--r--apps/theming/lib/ThemingDefaults.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php
index 85ad11943dd..2935355f26d 100644
--- a/apps/theming/lib/ThemingDefaults.php
+++ b/apps/theming/lib/ThemingDefaults.php
@@ -66,11 +66,11 @@ class ThemingDefaults extends \OC_Defaults {
public function __construct(IConfig $config,
IL10N $l,
IURLGenerator $urlGenerator,
- \OC_Defaults $defaults,
IAppData $appData,
ICacheFactory $cacheFactory,
Util $util
) {
+ parent::__construct();
$this->config = $config;
$this->l = $l;
$this->urlGenerator = $urlGenerator;
@@ -78,10 +78,10 @@ class ThemingDefaults extends \OC_Defaults {
$this->cacheFactory = $cacheFactory;
$this->util = $util;
- $this->name = $defaults->getName();
- $this->url = $defaults->getBaseUrl();
- $this->slogan = $defaults->getSlogan();
- $this->color = $defaults->getColorPrimary();
+ $this->name = parent::getName();
+ $this->url = parent::getBaseUrl();
+ $this->slogan = parent::getSlogan();
+ $this->color = parent::getColorPrimary();
}
public function getName() {