diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-06-08 14:44:47 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-08 14:44:47 +0300 |
| commit | d67f627ebac82bcf7d9f51d46407ecc5184c0405 (patch) | |
| tree | 46072a3afc43f5dd84b194c2ebb159ae98e44dee /apps/theming | |
| parent | ea53423b90952b3151707513d5968a6633feb660 (diff) | |
| parent | c31c995ff0415f2cff34b98d0959742cd5637c68 (diff) | |
Merge pull request #21058 from nextcloud/bug/set_serverBackground_custom_default
Set serverBackground if it is a custom background or default hub
Diffstat (limited to 'apps/theming')
| -rw-r--r-- | apps/theming/lib/Capabilities.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/theming/lib/Capabilities.php b/apps/theming/lib/Capabilities.php index f3ae5e1b715..56a331482bb 100644 --- a/apps/theming/lib/Capabilities.php +++ b/apps/theming/lib/Capabilities.php @@ -79,10 +79,10 @@ class Capabilities implements IPublicCapability { 'color-text' => $this->theming->getTextColorPrimary(), 'color-element' => $this->util->elementColor($color), 'logo' => $this->url->getAbsoluteURL($this->theming->getLogo()), - 'background' => $backgroundLogo === 'backgroundColor' ? + 'background' => $backgroundLogo === 'backgroundColor' || ($backgroundLogo === false && $this->theming->getColorPrimary() !== '#0082c9') ? $this->theming->getColorPrimary() : $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(), 'logoheader' => $this->url->getAbsoluteURL($this->theming->getLogo()), 'favicon' => $this->url->getAbsoluteURL($this->theming->getLogo()), |