diff options
| author | Julius Härtl <jus@bitgrid.net> | 2018-01-26 19:08:45 +0100 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2018-01-26 19:08:45 +0100 |
| commit | 67702136494b9b355e99c0960ee36accd5e97b85 (patch) | |
| tree | 81ad536a5a211cf514f11b08c1478f2472fbd731 | |
| parent | 68db09ddcef57faa58b5747e480347e867d03175 (diff) | |
| download | nextcloud-server-67702136494b9b355e99c0960ee36accd5e97b85.tar.gz nextcloud-server-67702136494b9b355e99c0960ee36accd5e97b85.zip | |
Do not rewrite absolute URLs
Signed-off-by: Julius Härtl <jus@bitgrid.net>
| -rw-r--r-- | apps/theming/lib/ThemingDefaults.php | 4 | ||||
| -rw-r--r-- | lib/private/Template/SCSSCacher.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php index 9dcc981817e..94abb4e288a 100644 --- a/apps/theming/lib/ThemingDefaults.php +++ b/apps/theming/lib/ThemingDefaults.php @@ -242,8 +242,8 @@ class ThemingDefaults extends \OC_Defaults { 'theming-background-mime' => "'" . $this->config->getAppValue('theming', 'backgroundMime', '') . "'" ]; - $variables['image-logo'] = "'".$this->urlGenerator->getAbsoluteURL($this->getLogo())."'"; - $variables['image-login-background'] = "'".$this->urlGenerator->getAbsoluteURL($this->getBackground())."'"; + $variables['image-logo'] = "'".$this->getLogo()."'"; + $variables['image-login-background'] = "'".$this->getBackground()."'"; $variables['image-login-plain'] = 'false'; if ($this->config->getAppValue('theming', 'color', null) !== null) { diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php index 391138255b0..c6473ead09d 100644 --- a/lib/private/Template/SCSSCacher.php +++ b/lib/private/Template/SCSSCacher.php @@ -298,7 +298,7 @@ class SCSSCacher { * @return string */ private function rebaseUrls($css, $webDir) { - $re = '/url\([\'"]([\.\w?=\/-]*)[\'"]\)/x'; + $re = '/url\([\'"]([^\/][\.\w?=\/-]*)[\'"]\)/x'; $subst = 'url(\''.$webDir.'/$1\')'; return preg_replace($re, $subst, $css); } |