summaryrefslogtreecommitdiffstats
path: root/apps/theming/lib
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2019-11-26 10:55:20 +0100
committerGitHub <noreply@github.com>2019-11-26 10:55:20 +0100
commitfe6dc8082c8f370cd1136bb0a0494b902ffbbea0 (patch)
tree7149df5d8ba57fd764761c34683cae49e3f9d901 /apps/theming/lib
parentdfe85ae0c2c542178657a0a610ecea9f7cd1cea6 (diff)
parent6d883f3641b769bda17d7267bdde42027f051e7d (diff)
downloadnextcloud-server-fe6dc8082c8f370cd1136bb0a0494b902ffbbea0.tar.gz
nextcloud-server-fe6dc8082c8f370cd1136bb0a0494b902ffbbea0.zip
add var for theming images , advanced options (#16815)
add var for theming images , advanced options
Diffstat (limited to 'apps/theming/lib')
-rw-r--r--apps/theming/lib/Capabilities.php2
-rw-r--r--apps/theming/lib/ThemingDefaults.php4
2 files changed, 4 insertions, 2 deletions
diff --git a/apps/theming/lib/Capabilities.php b/apps/theming/lib/Capabilities.php
index a75403a1fd5..e48c63d50fa 100644
--- a/apps/theming/lib/Capabilities.php
+++ b/apps/theming/lib/Capabilities.php
@@ -83,6 +83,8 @@ class Capabilities implements IPublicCapability {
$this->url->getAbsoluteURL($this->theming->getBackground()),
'background-plain' => $backgroundLogo === 'backgroundColor',
'background-default' => !$this->util->isBackgroundThemed(),
+ 'logoheader' => $this->url->getAbsoluteURL($this->theming->getLogo()),
+ 'favicon' => $this->url->getAbsoluteURL($this->theming->getLogo()),
],
];
}
diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php
index bca3d70e4ef..43af8f203fd 100644
--- a/apps/theming/lib/ThemingDefaults.php
+++ b/apps/theming/lib/ThemingDefaults.php
@@ -287,8 +287,8 @@ class ThemingDefaults extends \OC_Defaults {
];
$variables['image-logo'] = "url('".$this->imageManager->getImageUrl('logo')."')";
- $variables['image-logoheader'] = "'".$this->imageManager->getImageUrl('logoheader')."'";
- $variables['image-favicon'] = "'".$this->imageManager->getImageUrl('favicon')."'";
+ $variables['image-logoheader'] = "url('".$this->imageManager->getImageUrl('logoheader')."')";
+ $variables['image-favicon'] = "url('".$this->imageManager->getImageUrl('favicon')."')";
$variables['image-login-background'] = "url('".$this->imageManager->getImageUrl('background')."')";
$variables['image-login-plain'] = 'false';