From 9159ed3d76750956754945c934f2d4d2a6b11e70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 18 Jul 2018 19:05:32 +0200 Subject: [PATCH] Fix icon url regex MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- core/css/icons.scss | 2 +- lib/private/Template/IconsCacher.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/css/icons.scss b/core/css/icons.scss index e450097e3f9..27863f017f4 100644 --- a/core/css/icons.scss +++ b/core/css/icons.scss @@ -396,7 +396,7 @@ img, object, video, button, textarea, input, select, div[contenteditable='true'] } .icon-star-dark { - @include icon-color('star-dark', 'actions', $color-black, 1, true); + @include icon-color('star', 'actions', $color-black, 1, true); } .icon-starred { diff --git a/lib/private/Template/IconsCacher.php b/lib/private/Template/IconsCacher.php index a8dacfcfbc0..5e5e0fda50b 100644 --- a/lib/private/Template/IconsCacher.php +++ b/lib/private/Template/IconsCacher.php @@ -46,7 +46,7 @@ class IconsCacher { protected $urlGenerator; /** @var string */ - private $iconVarRE = '/--(icon-[a-z0-9-]+): url\(["\']([a-z0-9-\/]+)[^;]+;/m'; + private $iconVarRE = '/--(icon-[a-z0-9-]+): url\(["\']([a-z0-9-_\~\/\?\&\=\.]+)[^;]+;/m'; /** @var string */ private $fileName = 'icons-vars.css';