Merge pull request #10415 from nextcloud/bugfix/noid/regex-icons

Fix regex for icon urls
nextcloud · Jul 27, 2018 · 7b23cf3 · 7b23cf3
2 parents 6ccc34f + f77cc11
commit 7b23cf3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 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) {

diff --git a/tests/lib/Template/IconsCacherTest.php b/tests/lib/Template/IconsCacherTest.php
@@ -86,7 +86,7 @@ public function testGetIconsFromValidCss() {
 		";
 		$actual = self::invokePrivate($this->iconsCacher, 'getIconsFromCss', [$css]);
 		$expected = array(
-			'icon-test' => '/svg/core/actions/add/000'
+			'icon-test' => '/svg/core/actions/add/000?v=1'
 		);
 		$this->assertEquals($expected, $actual);
 	}