sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Logo and background URLs must be relative 

They are used way to often for such a change

Signed-off-by: Joas Schilling <coding@schilljs.com>
pull/3531/head
Joas Schilling 2017-04-24 12:15:28 +07:00
parent bc1efdf2e1
commit bedd500884
No known key found for this signature in database
GPG Key ID: E166FD8976B3BAC8
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/theming/lib/ThemingDefaults.php
Unescape Escape View File

@ -144,10 +144,10 @@ class ThemingDefaults extends \OC_Defaults {
$cacheBusterCounter = $this->config->getAppValue('theming', 'cachebuster', '0');
if(!$logo || !$logoExists) {
return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core','logo.svg') . '?v=' . $cacheBusterCounter);
return $this->urlGenerator->imagePath('core','logo.svg') . '?v=' . $cacheBusterCounter;
}
return $this->urlGenerator->linkToRouteAbsolute('theming.Theming.getLogo') . '?v=' . $cacheBusterCounter;
return $this->urlGenerator->linkToRoute('theming.Theming.getLogo') . '?v=' . $cacheBusterCounter;
}
/**
@ -169,7 +169,7 @@ class ThemingDefaults extends \OC_Defaults {
return $this->urlGenerator->imagePath('core','background.jpg');
}
return $this->urlGenerator->linkToRouteAbsolute('theming.Theming.getLoginBackground');
return $this->urlGenerator->linkToRoute('theming.Theming.getLoginBackground');
}
@ -186,8 +186,8 @@ class ThemingDefaults extends \OC_Defaults {
'theming-cachebuster' => "'" . $this->config->getAppValue('theming', 'cachebuster', '0') . "'",
];
$variables['image-logo'] = "'".$this->getLogo()."'";
$variables['image-login-background'] = "'".$this->getBackground()."'";
$variables['image-logo'] = "'".$this->urlGenerator->getAbsoluteURL($this->getLogo())."'";
$variables['image-login-background'] = "'".$this->urlGenerator->getAbsoluteURL($this->getBackground())."'";
if ($this->config->getAppValue('theming', 'color', null) !== null) {
if ($this->util->invertTextColor($this->getColorPrimary())) {

9
apps/theming/tests/ThemingDefaultsTest.php
Unescape Escape View File

@ -432,8 +432,7 @@ class ThemingDefaultsTest extends TestCase {
->method('getAppValue')
->with('theming', 'backgroundMime', false)
->willReturn('image/svg+xml');
$expected = $this->urlGenerator->linkToRouteAbsolute('theming.Theming.getLoginBackground');
$this->assertEquals($expected, $this->template->getBackground());
$this->assertEquals('/index.php/apps/theming/loginbackground', $this->template->getBackground());
}
public function testGetLogoDefault() {
@ -455,8 +454,7 @@ class ThemingDefaultsTest extends TestCase {
->method('getFolder')
->with('images')
->willThrowException(new \Exception());
$expected = $this->urlGenerator->getAbsoluteURL('/core/img/logo.svg') . '?v=0';
$this->assertEquals($expected, $this->template->getLogo());
$this->assertEquals('/core/img/logo.svg?v=0', $this->template->getLogo());
}
public function testGetLogoCustom() {
@ -478,8 +476,7 @@ class ThemingDefaultsTest extends TestCase {
->method('getAppValue')
->with('theming', 'cachebuster', '0')
->willReturn('0');
$expected = $this->urlGenerator->getAbsoluteURL('index.php/apps/theming/logo') . '?v=0';
$this->assertEquals($expected, $this->template->getLogo());
$this->assertEquals('/index.php/apps/theming/logo?v=0', $this->template->getLogo());
}
public function testGetScssVariablesCached() {