diff options
author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-07-27 07:23:04 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-27 07:23:04 +0200 |
commit | 7b23cf3dc69ebcdeda996bd0a2e3c930f68a379a (patch) | |
tree | fd464998dcffc496368ecba798cdc65091118c2d /lib | |
parent | 6ccc34f5af4352cdaec9b5d09a99b31583310a87 (diff) | |
parent | f77cc11a2832c83c7246fb3adb946b46c9361a6b (diff) | |
download | nextcloud-server-7b23cf3dc69ebcdeda996bd0a2e3c930f68a379a.tar.gz nextcloud-server-7b23cf3dc69ebcdeda996bd0a2e3c930f68a379a.zip |
Merge pull request #10415 from nextcloud/bugfix/noid/regex-icons
Fix regex for icon urls
Diffstat (limited to 'lib')
-rw-r--r-- | lib/private/Template/IconsCacher.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/Template/IconsCacher.php b/lib/private/Template/IconsCacher.php index e5ebecaf169..e5ea1b33815 100644 --- a/lib/private/Template/IconsCacher.php +++ b/lib/private/Template/IconsCacher.php @@ -47,7 +47,7 @@ class IconsCacher { protected $urlGenerator; /** @var string */ - private $iconVarRE = '/--(icon-[a-zA-Z0-9-]+): url\(["\']([a-z0-9-_\~\/\.]+)[^;]+;/m'; + private $iconVarRE = '/--(icon-[a-zA-Z0-9-]+): url\(["\']([a-zA-Z0-9-_\~\/\.\?\=]+)[^;]+;/m'; /** @var string */ private $fileName = 'icons-vars.css'; @@ -101,7 +101,7 @@ class IconsCacher { $data = ''; foreach ($icons as $icon => $url) { - $data .= "--$icon: url('$url?v=1');"; + $data .= "--$icon: url('$url');"; } if (strlen($data) > 0) { |