Fix regex for icon urls

Use the version from the url rather than hardcoding v=1. Also allow uppercase chars in the url, so that uppercase hex color values will also be included Signed-off-by: Julius Härtl <[email protected]>
nextcloud · Jul 26, 2018 · 8aa0f04 · 8aa0f04
1 parent 6514bf1
commit 8aa0f04
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/core/img/actions/star-dark.svg b/core/img/actions/star-dark.svg
diff --git 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 @@ public function setIconsCss(string $css) {
 
 		$data = '';
 		foreach ($icons as $icon => $url) {
-			$data .= "--$icon: url('$url?v=1');";
+			$data .= "--$icon: url('$url');";
 		}
 
 		if (strlen($data) > 0) {