diff options
| author | Michael Weimann <mail@michael-weimann.eu> | 2018-08-28 15:58:27 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2018-10-02 08:37:54 +0200 |
| commit | d855c38e078f2cd0bec86d5a20fc2f448799433b (patch) | |
| tree | 68f4adfc1ff3a97273fbc47e9584d922e70c4b61 /core/Controller | |
| parent | 92049c3ceb4121c6e424e8ba902cc6ebc663c690 (diff) | |
| download | nextcloud-server-d855c38e078f2cd0bec86d5a20fc2f448799433b.tar.gz nextcloud-server-d855c38e078f2cd0bec86d5a20fc2f448799433b.zip | |
Moves the logo files to logo
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
Diffstat (limited to 'core/Controller')
| -rw-r--r-- | core/Controller/LoginController.php | 2 | ||||
| -rw-r--r-- | core/Controller/SvgController.php | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/core/Controller/LoginController.php b/core/Controller/LoginController.php index 09b6fe54384..fed97177eef 100644 --- a/core/Controller/LoginController.php +++ b/core/Controller/LoginController.php @@ -194,7 +194,7 @@ class LoginController extends Controller { Util::addHeader('meta', ['property' => 'og:site_name', 'content' => Util::sanitizeHTML($this->defaults->getName())]); Util::addHeader('meta', ['property' => 'og:url', 'content' => $this->urlGenerator->getAbsoluteURL('/')]); Util::addHeader('meta', ['property' => 'og:type', 'content' => 'website']); - Util::addHeader('meta', ['property' => 'og:image', 'content' => $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core','favicon-touch.png'))]); + Util::addHeader('meta', ['property' => 'og:image', 'content' => $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'favicon-touch.png'))]); return new TemplateResponse( $this->appName, 'login', $parameters, 'guest' diff --git a/core/Controller/SvgController.php b/core/Controller/SvgController.php index 1fad9c39c3b..f0fc1dac4d4 100644 --- a/core/Controller/SvgController.php +++ b/core/Controller/SvgController.php @@ -91,7 +91,7 @@ class SvgController extends Controller { $appRootPath = $this->appManager->getAppPath($app); $appPath = substr($appRootPath, strlen($this->serverRoot)); - + if (!$appPath) { return new NotFoundResponse(); } @@ -119,8 +119,7 @@ class SvgController extends Controller { } // add fill (fill is not present on black elements) - $fillRe = '/<((circle|rect|path)((?!fill)[a-z0-9 =".\-#():;])+)\/>/mi'; - + $fillRe = '/<((circle|rect|path)((!fill)[a-z0-9 =".\-#():;])+)\/>/mi'; $svg = preg_replace($fillRe, '<$1 fill="#' . $color . '"/>', $svg); // replace any fill or stroke colors |