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

Merge pull request #21058 from nextcloud/bug/set_serverBackground_custom_default 

Set serverBackground if it is a custom background or default hub
This commit is contained in:
Roeland Jago Douma 2020-06-08 13:44:47 +02:00 committed by GitHub
parent ea53423b90 c31c995ff0
commit d67f627eba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/theming/lib/Capabilities.php
View File

@ -79,10 +79,10 @@ class Capabilities implements IPublicCapability {
'color-text' => $this->theming->getTextColorPrimary(), 'color-text' => $this->theming->getTextColorPrimary(),
'color-element' => $this->util->elementColor($color), 'color-element' => $this->util->elementColor($color),
'logo' => $this->url->getAbsoluteURL($this->theming->getLogo()), 'logo' => $this->url->getAbsoluteURL($this->theming->getLogo()),
'background' => $backgroundLogo === 'backgroundColor' ? 'background' => $backgroundLogo === 'backgroundColor' || ($backgroundLogo === false && $this->theming->getColorPrimary() !== '#0082c9') ?
$this->theming->getColorPrimary() : $this->theming->getColorPrimary() :
$this->url->getAbsoluteURL($this->theming->getBackground()), $this->url->getAbsoluteURL($this->theming->getBackground()),
'background-plain' => $backgroundLogo === 'backgroundColor', 'background-plain' => $backgroundLogo === 'backgroundColor' || ($backgroundLogo === false && $this->theming->getColorPrimary() !== '#0082c9'),
'background-default' => !$this->util->isBackgroundThemed(), 'background-default' => !$this->util->isBackgroundThemed(),
'logoheader' => $this->url->getAbsoluteURL($this->theming->getLogo()), 'logoheader' => $this->url->getAbsoluteURL($this->theming->getLogo()),
'favicon' => $this->url->getAbsoluteURL($this->theming->getLogo()), 'favicon' => $this->url->getAbsoluteURL($this->theming->getLogo()),